* Re: [PATCH] perf util: Fix null pointer dereference
[not found] <20200605091740.40206-1-yaohongbo@huawei.com>
@ 2020-06-08 16:36 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; only message in thread
From: Arnaldo Carvalho de Melo @ 2020-06-08 16:36 UTC (permalink / raw)
To: Hongbo Yao
Cc: alexander.shishkin, mark.rutland, jolsa, namhyung, liwei391,
Linux Kernel Mailing List
Em Fri, Jun 05, 2020 at 05:17:40PM +0800, Hongbo Yao escreveu:
> 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.
Looks legit, but you forgot to add this:
Cc: Jiri Olsa <jolsa@kernel.org>
Fixes: 088519f318be ("perf stat: Move the display functions to stat-display.c")
That is not completely correct as this is just moving pre-existing code
(and bugs) to a different place, but at least the stable guys will get
this fix back to a good number of kernels.
Also you forgot to CC lkml,
Thanks, applied.
- Arnaldo
> Signed-off-by: Hongbo Yao <yaohongbo@huawei.com>
> ---
> 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 3c6976f7574c..57d0706e1330 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -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)
> --
> 2.20.1
>
--
- Arnaldo
^ permalink raw reply [flat|nested] only message in thread