lkml.org 
[lkml]   [2015]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf probe: Fix to free temporal Dwarf_Frame
    Commit-ID:  05c8d802fa52ef17dbcce21c38b72b4a313eb036
    Gitweb: http://git.kernel.org/tip/05c8d802fa52ef17dbcce21c38b72b4a313eb036
    Author: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    AuthorDate: Wed, 18 Nov 2015 15:40:12 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Thu, 19 Nov 2015 13:19:17 -0300

    perf probe: Fix to free temporal Dwarf_Frame

    Since dwarf_cfi_addrframe returns malloc'd Dwarf_Frame object, it has to
    be freed after it is used.

    Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/20151118064011.30709.65674.stgit@localhost.localdomain
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/probe-finder.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
    index 05012bb..1cab05a 100644
    --- a/tools/perf/util/probe-finder.c
    +++ b/tools/perf/util/probe-finder.c
    @@ -683,21 +683,24 @@ static int call_probe_finder(Dwarf_Die *sc_die, struct probe_finder *pf)
    ret = dwarf_getlocation_addr(&fb_attr, pf->addr, &pf->fb_ops, &nops, 1);
    if (ret <= 0 || nops == 0) {
    pf->fb_ops = NULL;
    + ret = 0;
    #if _ELFUTILS_PREREQ(0, 142)
    } else if (nops == 1 && pf->fb_ops[0].atom == DW_OP_call_frame_cfa &&
    pf->cfi != NULL) {
    - Dwarf_Frame *frame;
    + Dwarf_Frame *frame = NULL;
    if (dwarf_cfi_addrframe(pf->cfi, pf->addr, &frame) != 0 ||
    dwarf_frame_cfa(frame, &pf->fb_ops, &nops) != 0) {
    pr_warning("Failed to get call frame on 0x%jx\n",
    (uintmax_t)pf->addr);
    - return -ENOENT;
    + ret = -ENOENT;
    }
    + free(frame);
    #endif
    }

    /* Call finder's callback handler */
    - ret = pf->callback(sc_die, pf);
    + if (ret >= 0)
    + ret = pf->callback(sc_die, pf);

    /* *pf->fb_ops will be cached in libdw. Don't free it. */
    pf->fb_ops = NULL;

    \
     
     \ /
      Last update: 2015-11-23 17:41    [W:2.199 / U:1.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site