[PATCH] perf script: avoid null dereference on symbol

From: Ian Rogers
Date: Mon Apr 20 2020 - 20:43:36 EST


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

Fixes: cd2bedb7863e9 (perf script: Allow --symbol to accept hexadecimal addresses)
Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
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) {
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