[PATCH -tip ] [BUGFIX] perf probe: fix to initialize fname always before use it

[PATCH -tip ] [BUGFIX] perf probe: fix to initialize fname always before use it

[Masami Hiramatsu]

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.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Namhyung Kim <namhyung@kernel.org>
---
 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 c044052..e41b094 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1460,10 +1460,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;
 		}
 

Re: [PATCH -tip ] [BUGFIX] perf probe: fix to initialize fname always before use it

[Masami Hiramatsu]

Hi Arnaldo,

I've found a bug in my previous patch which was already picked
in the perf/urgent branch. The buggy commit id is

e08cfd4bda7683cdbe6971c26cf23e2afdb1e7a8

And this is not related to the previous series of perf probe
updates.

Thank you,

(2013/10/11 21:23), Masami Hiramatsu wrote:
> 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.
> 
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
> Cc: Namhyung Kim <namhyung@kernel.org>
> ---
>  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 c044052..e41b094 100644
> --- a/tools/perf/util/probe-finder.c
> +++ b/tools/perf/util/probe-finder.c
> @@ -1460,10 +1460,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;
>  		}


-- 
Masami HIRAMATSU
IT Management Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@hitachi.com

Re: [PATCH -tip ] [BUGFIX] perf probe: fix to initialize fname always before use it

[Arnaldo Carvalho de Melo]

Em Fri, Oct 11, 2013 at 09:31:47PM +0900, Masami Hiramatsu escreveu:
> Hi Arnaldo,
> 
> I've found a bug in my previous patch which was already picked
> in the perf/urgent branch. The buggy commit id is
> 
> e08cfd4bda7683cdbe6971c26cf23e2afdb1e7a8
> 
> And this is not related to the previous series of perf probe
> updates.

Ok, so it must go via perf/urgent or if that ends up not being anymore
possible, via stable, will try the perf/urgent path today,

- Arnaldo
 
> Thank you,
> 
> (2013/10/11 21:23), Masami Hiramatsu wrote:
> > 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.
> > 
> > Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Cc: Paul Mackerras <paulus@samba.org>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > ---
> >  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 c044052..e41b094 100644
> > --- a/tools/perf/util/probe-finder.c
> > +++ b/tools/perf/util/probe-finder.c
> > @@ -1460,10 +1460,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;
> >  		}
> 
> 
> -- 
> Masami HIRAMATSU
> IT Management Research Dept. Linux Technology Center
> Hitachi, Ltd., Yokohama Research Laboratory
> E-mail: masami.hiramatsu.pt@hitachi.com
> 

[tip:perf/urgent] perf probe: Fix to initialize fname always before use it

[tip-bot for Masami Hiramatsu]

Commit-ID:  1b286bdd5b7684c681b63d5e75cada037064c315
Gitweb:     http://git.kernel.org/tip/1b286bdd5b7684c681b63d5e75cada037064c315
Author:     Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
AuthorDate: Fri, 11 Oct 2013 12:23:17 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <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 | 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;
 		}