Commit-ID:  1b286bdd5b7684c681b63d5e75cada037064c315
Gitweb:     http://git.kernel.org/tip/1b286bdd5b7684c681b63d5e75cada037064c315
Author:     Masami Hiramatsu <[email protected]>
AuthorDate: Fri, 11 Oct 2013 12:23:17 +0000
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 15 Oct 2013 14:37:38 -0300

perf probe: Fix to initialize fname always before use it

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 <[email protected]>
        Date:   Mon Sep 30 18:21:44 2013 +0900

            perf probe: Fix to find line information for probe list

Signed-off-by: Masami Hiramatsu <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/probe-finder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index c09e0a9..f069273 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -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;
                }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to