[PATCH 04/91] perf script: Avoid NULL dereference on symbol

[Arnaldo Carvalho de Melo]

From: Ian Rogers <irog...@google.com>

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

Fixes: d2bedb7863e9 ("perf script: Allow --symbol to accept hexadecimal 
addresses")
Signed-off-by: Ian Rogers <irog...@google.com>
Acked-by: Jiri Olsa <jo...@redhat.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Stephane Eranian <eran...@google.com>
Link: http://lore.kernel.org/lkml/20200421004329.43109-1-irog...@google.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.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) {
                        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.21.1