Commit 98a8b2e6 authored Oct 11, 2019 by Andi Kleen Committed by Arnaldo Carvalho de Melo Oct 15, 2019

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: 7834fa94 ("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>

parent 6a6fac11

tools/perf/util/evlist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message