summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2019-10-11 20:21:40 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-10-15 16:51:33 +0200
commit98a8b2e60c69927b1f405c3b001a1de3f4e53901 (patch)
tree56c5ff60dc9aa73ae008f8919665188480234d3e /tools
parentperf jvmti: Link against tools/lib/ctype.h to have weak strlcpy() (diff)
downloadlinux-98a8b2e60c69927b1f405c3b001a1de3f4e53901.tar.xz
linux-98a8b2e60c69927b1f405c3b001a1de3f4e53901.zip
perf evlist: Fix fix for freed id arrays
In the earlier fix for the memory overrun of id arrays I managed to typo the wrong event in the fix. Of course we need to close the current event in the loop, not the original failing event. The same test case as in the original patch still passes. Fixes: 7834fa948beb ("perf evlist: Fix access of freed id arrays") Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Link: http://lore.kernel.org/lkml/20191011182140.8353-2-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/evlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index d277a98e62df..de79c735e441 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1659,7 +1659,7 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,
is_open = false;
if (c2->leader == leader) {
if (is_open)
- perf_evsel__close(&evsel->core);
+ perf_evsel__close(&c2->core);
c2->leader = c2;
c2->core.nr_members = 0;
}