Re: [PATCH v7 10/13] perf tools: fix NULL point in evsel__env()

From: Arnaldo Carvalho de Melo
Date: Fri Mar 25 2022 - 15:36:00 EST


Em Tue, Mar 22, 2022 at 03:15:14PM -0700, Stephane Eranian escreveu:
> evsel_env() cannot return NULL. In case evsel->evlist->env is NULL default
> to perf_env. Fixes crashes in evsel__open_strerror()
>
> Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxx>
> Reviewed-by: Stephane Eranian <eranian@xxxxxxxxxx>

I have this already in from a patch by Kim Phillips.

- Arnaldo

> ---
> tools/perf/util/evsel.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 22d3267ce294..14b0e7ffa2c7 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -2965,7 +2965,7 @@ int evsel__open_strerror(struct evsel *evsel, struct target *target,
>
> struct perf_env *evsel__env(struct evsel *evsel)
> {
> - if (evsel && evsel->evlist)
> + if (evsel && evsel->evlist && evsel->evlist->env)
> return evsel->evlist->env;
> return &perf_env;
> }
> --
> 2.35.1.894.gb6a874cedc-goog

--

- Arnaldo