Messages in this thread | | | From | Ian Rogers <> | Date | Wed, 22 Apr 2020 08:35:24 -0700 | Subject | Re: [PATCH] perf script: avoid null dereference on symbol |
| |
On Wed, Apr 22, 2020 at 6:59 AM Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: > > Em Wed, Apr 22, 2020 at 10:20:16AM +0200, Jiri Olsa escreveu: > > On Mon, Apr 20, 2020 at 05:43:29PM -0700, Ian Rogers wrote: > > > al->sym may be null given current if conditions and may cause a segv. > > > > > > Fixes: cd2bedb7863e9 (perf script: Allow --symbol to accept hexadecimal addresses) > > > > seems it's wrong commit number, I see it under d2bedb7863e9 > > Thanks, added your Acked-by, I noticed the wrong commit number, fixed it > up to the same you point above.
Thanks for fixing the commit number, I'll try to figure out why I'm calculating these incorrectly.
Ian
> - Arnaldo > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > --- > > > tools/perf/util/event.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c > > > index dc0e11214ae1..f581550a3015 100644 > > > --- a/tools/perf/util/event.c > > > +++ b/tools/perf/util/event.c > > > @@ -626,7 +626,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al, > > > ret = strlist__has_entry(symbol_conf.sym_list, > > > al->sym->name); > > > } > > > - if (!(ret && al->sym)) { > > > + if (!ret && al->sym) { > > > > Acked-by: Jiri Olsa <jolsa@redhat.com> > > > > thanks, > > jirka > > > > > snprintf(al_addr_str, sz, "0x%"PRIx64, > > > al->map->unmap_ip(al->map, al->sym->start)); > > > ret = strlist__has_entry(symbol_conf.sym_list, > > > -- > > > 2.26.1.301.g55bc3eb7cb9-goog > > > > > > > -- > > - Arnaldo
| |