Commit 1e76b171 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf script: Avoid NULL dereference on symbol

al->sym may be NULL given current if conditions and may cause a segv.

Fixes: d2bedb78 ("perf script: Allow --symbol to accept hexadecimal addresses")
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200421004329.43109-1-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8fbd301b
...@@ -626,7 +626,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al, ...@@ -626,7 +626,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al,
ret = strlist__has_entry(symbol_conf.sym_list, ret = strlist__has_entry(symbol_conf.sym_list,
al->sym->name); al->sym->name);
} }
if (!(ret && al->sym)) { if (!ret && al->sym) {
snprintf(al_addr_str, sz, "0x%"PRIx64, snprintf(al_addr_str, sz, "0x%"PRIx64,
al->map->unmap_ip(al->map, al->sym->start)); al->map->unmap_ip(al->map, al->sym->start));
ret = strlist__has_entry(symbol_conf.sym_list, ret = strlist__has_entry(symbol_conf.sym_list,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment