Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d21635a authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Fix to ensure function declared file 



Fix to ensure function declared file matches given file name. This fixes
a potential bug.

As I've commented on Lin Ming's fastpath enhancement, decl_file should
be checked on each probe point if user gives a probe point as func@file.

Cc: 2nddept-manager@sdl.hitachi.co.jp
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110330092541.2132.3584.stgit@ltc236.sdl.hitachi.co.jp>
Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fd1edb3a

tools/perf/util/probe-finder.c

+8 −0
Original line number Diff line number Diff line
@@ -1395,6 +1395,10 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) 
	    !die_compare_name(sp_die, pp->function))

		return DWARF_CB_OK;



	/* Check declared file */

	if (pp->file && strtailcmp(pp->file, dwarf_decl_file(sp_die)))

		return DWARF_CB_OK;



	pf->fname = dwarf_decl_file(sp_die);

	if (pp->line) { /* Function relative line */

		dwarf_decl_line(sp_die, &pf->lno);
@@ -1840,6 +1844,10 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data) 
	struct line_finder *lf = param->data;

	struct line_range *lr = lf->lr;



	/* Check declared file */

	if (lr->file && strtailcmp(lr->file, dwarf_decl_file(sp_die)))

		return DWARF_CB_OK;



	if (dwarf_tag(sp_die) == DW_TAG_subprogram &&

	    die_compare_name(sp_die, lr->function)) {

		lf->fname = dwarf_decl_file(sp_die);