summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2019-10-11 11:21:40 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-10-15 08:36:22 -0300
commit5a40e1994815ab09c59614c6a13d94eef55d1a7f (patch)
treebeb751b7d912c9cfbe712724dfae91c245288fad
parentb3509b6ed7a79ec49f6b64e4f3b780f259a2a468 (diff)
downloadlinux-5a40e1994815ab09c59614c6a13d94eef55d1a7f.tar.gz
linux-5a40e1994815ab09c59614c6a13d94eef55d1a7f.tar.bz2
linux-5a40e1994815ab09c59614c6a13d94eef55d1a7f.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>
-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 21b77efa802c..8793b4e322b0 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1599,7 +1599,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;
}