| From 88f6453095e8f939a12136d9838bbdcc78016939 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 5 Jun 2020 17:17:40 +0800 |
| Subject: perf stat: Fix NULL pointer dereference |
| |
| From: Hongbo Yao <yaohongbo@huawei.com> |
| |
| [ Upstream commit c0c652fc705de75f4ba52e93053acc1ed3933e74 ] |
| |
| 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: 088519f318be ("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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/util/stat-display.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c |
| index 9e757d18d713b..cf393c3eea233 100644 |
| --- a/tools/perf/util/stat-display.c |
| +++ b/tools/perf/util/stat-display.c |
| @@ -671,7 +671,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); |
| @@ -1172,7 +1172,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) |
| -- |
| 2.25.1 |
| |
