Commit c0c652fc authored Jun 05, 2020 by Hongbo Yao Committed by Arnaldo Carvalho de Melo Jun 09, 2020

perf stat: Fix NULL pointer dereference



If config->aggr_map is NULL and config->aggr_get_id is not NULL,
the function print_aggr() will still calling arrg_update_shadow(),
which can result in accessing the invalid pointer.

Fixes: 088519f3 ("perf stat: Move the display functions to stat-display.c")
Signed-off-by: Hongbo Yao <yaohongbo@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wei Li <liwei391@huawei.com>
Link: https://lore.kernel.org/lkml/20200608163625.GC3073@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 11b6e548

tools/perf/util/stat-display.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -668,7 +668,7 @@ static void print_aggr(struct perf_stat_config *config,
		int s;
		bool first;

		if (!(config->aggr_map \|\| config->aggr_get_id))
		if (!config->aggr_map \|\| !config->aggr_get_id)
		return;

		aggr_update_shadow(config, evlist);
		@@ -1169,7 +1169,7 @@ static void print_percore(struct perf_stat_config *config,
		int s;
		bool first = true;

		if (!(config->aggr_map \|\| config->aggr_get_id))
		if (!config->aggr_map \|\| !config->aggr_get_id)
		return;

		if (config->percore_show_thread)

Admin message