lkml.org 
[lkml]   [2011]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -tip 01/12] [BUGFIX]perf probe: Fix to ensure function declared file
    Date
    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.

    Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    ---

    tools/perf/util/probe-finder.c | 8 ++++++++
    1 files changed, 8 insertions(+), 0 deletions(-)

    diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
    index 23fc9eb..30915bb 100644
    --- a/tools/perf/util/probe-finder.c
    +++ b/tools/perf/util/probe-finder.c
    @@ -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);
    @@ -1891,6 +1895,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);


    \
     
     \ /
      Last update: 2011-03-30 11:35    [W:0.024 / U:394.148 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site