Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757247AbbKRWgq (ORCPT ); Wed, 18 Nov 2015 17:36:46 -0500 Received: from mail.kernel.org ([198.145.29.136]:36558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756151AbbKRWgp (ORCPT ); Wed, 18 Nov 2015 17:36:45 -0500 Date: Wed, 18 Nov 2015 19:36:39 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: Peter Zijlstra , linux-kernel@vger.kernel.org, Adrian Hunter , Ingo Molnar , Namhyung Kim , Jiri Olsa Subject: Re: [PATCH perf/core 01/13] perf probe: Fix to free temporal Dwarf_Frame Message-ID: <20151118223639.GB22729@kernel.org> References: <20151118064009.30709.74354.stgit@localhost.localdomain> <20151118064011.30709.65674.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151118064011.30709.65674.stgit@localhost.localdomain> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1762 Lines: 48 Em Wed, Nov 18, 2015 at 03:40:12PM +0900, Masami Hiramatsu escreveu: > Since dwarf_cfi_addrframe returns malloc'd Dwarf_Frame > object, it has to be freed after used. Applied to perf/urgent > Signed-off-by: Masami Hiramatsu > --- > 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 63993d7..4d7d4f4 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/