]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
perf tools: Fix segfault when using srcline sort key
authorNamhyung Kim <namhyung.kim@lge.com>
Mon, 15 Oct 2012 03:39:42 +0000 (12:39 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 16 Oct 2012 16:05:07 +0000 (13:05 -0300)
The srcline sort key is for grouping samples based on their source file
and line number.  It use addr2line tool to get the information but it
requires dso name.  It caused a segfault when a sample does not have the
name by dereferencing a NULL pointer.  Fix it by using raw ip addresses
for those samples.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1350272383-7016-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/sort.c

index b5b1b9211960884efd1a4c707fa8c56910db01f1..dd68f115d3927702d695d6a419fb2218d5db6fac 100644 (file)
@@ -260,6 +260,9 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
        if (path != NULL)
                goto out_path;
 
+       if (!self->ms.map)
+               goto out_ip;
+
        snprintf(cmd, sizeof(cmd), "addr2line -e %s %016" PRIx64,
                 self->ms.map->dso->long_name, self->ip);
        fp = popen(cmd, "r");