perf probe: Fix to initialize fname always before use it
authorMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Fri, 11 Oct 2013 12:23:17 +0000 (12:23 +0000)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 15 Oct 2013 17:37:38 +0000 (14:37 -0300)
Fix perf probe --list to initialize fname local var always before
use it. This may cause a SEGV if there is a probe which is in
the function body but not in any inline function.

Problem introduced in:

commit e08cfd4bda76
Author: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Date:   Mon Sep 30 18:21:44 2013 +0900

    perf probe: Fix to find line information for probe list

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20131011122317.9662.29736.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/probe-finder.c

index c09e0a9..f069273 100644 (file)
@@ -1357,10 +1357,10 @@ int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr,
                        goto post;
                }
 
+               fname = dwarf_decl_file(&spdie);
                if (addr == (unsigned long)baseaddr) {
                        /* Function entry - Relative line number is 0 */
                        lineno = baseline;
-                       fname = dwarf_decl_file(&spdie);
                        goto post;
                }