]> git.baikalelectronics.ru Git - kernel.git/commit
perf stat: Fix segfault for event group in repeat mode
authorJiri Olsa <jolsa@redhat.com>
Mon, 15 Jul 2019 14:21:21 +0000 (16:21 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 23 Jul 2019 12:00:05 +0000 (09:00 -0300)
commitc763df13cc476b5af5807e6681154ee118dcbc1b
tree64691a4d5a04b9217bc0c0a043c5d8fe437b157a
parent2280731a436cf4e46a79902c1fa60777387d8897
perf stat: Fix segfault for event group in repeat mode

Numfor Mbiziwo-Tiapo reported segfault on stat of event group in repeat
mode:

  # perf stat -e '{cycles,instructions}' -r 10 ls

It's caused by memory corruption due to not cleaned evsel's id array and
index, which needs to be rebuilt in every stat iteration. Currently the
ids index grows, while the array (which is also not freed) has the same
size.

Fixing this by releasing id array and zeroing ids index in
perf_evsel__close function.

We also need to keep the evsel_list alive for stat record (which is
disabled in repeat mode).

Reported-by: Numfor Mbiziwo-Tiapo <nums@google.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Drayton <mbd@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20190715142121.GC6032@krava
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-stat.c
tools/perf/util/evsel.c