From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Paul Mackerras <paulus@samba.org>,
Pekka Enberg <penberg@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
yrl.pp-manager.tt@hitachi.com,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 04/12] perf probe: Fix a memory leak for scopes array
Date: Fri, 12 Aug 2011 13:28:56 -0300 [thread overview]
Message-ID: <1313166544-6209-5-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1313166544-6209-1-git-send-email-acme@infradead.org>
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Fix a memory leak for scopes array when it finds a variable in the
global scope.
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20110811110229.19900.63019.stgit@fedora15
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-finder.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 3e44a3e..573c723 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -660,6 +660,7 @@ static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf)
else {
/* Search upper class */
nscopes = dwarf_getscopes_die(sp_die, &scopes);
+ ret = -ENOENT;
while (nscopes-- > 1) {
pr_debug("Searching variables in %s\n",
dwarf_diename(&scopes[nscopes]));
@@ -668,14 +669,12 @@ static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf)
pf->pvar->var, 0,
&vr_die)) {
ret = convert_variable(&vr_die, pf);
- goto found;
+ break;
}
}
if (scopes)
free(scopes);
- ret = -ENOENT;
}
-found:
if (ret < 0)
pr_warning("Failed to find '%s' in this function.\n",
pf->pvar->var);
--
1.6.2.5
next prev parent reply other threads:[~2011-08-12 16:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-12 16:28 [GIT PULL 00/12] perf fixes Arnaldo Carvalho de Melo
2011-08-12 16:28 ` [PATCH 01/12] perf top browser: Remove spurious helpline update Arnaldo Carvalho de Melo
2011-08-12 16:28 ` [PATCH 02/12] perf report: Use properly build_id kernel binaries Arnaldo Carvalho de Melo
2011-08-12 16:28 ` [PATCH 03/12] perf: fix temporary file ownership check Arnaldo Carvalho de Melo
2011-08-12 16:28 ` Arnaldo Carvalho de Melo [this message]
2011-08-12 16:28 ` [PATCH 05/12] perf probe: Fix line walker to check CU correctly Arnaldo Carvalho de Melo
2011-08-12 16:28 ` [PATCH 06/12] perf probe: Fix to search nested inlined functions in CU Arnaldo Carvalho de Melo
2011-08-12 16:28 ` [PATCH 07/12] perf probe: Fix to walk all inline instances Arnaldo Carvalho de Melo
2011-08-12 16:29 ` [PATCH 08/12] perf probe: Warn when more than one line are given Arnaldo Carvalho de Melo
2011-08-12 16:29 ` [PATCH 09/12] perf probe: Fix to search local variables in appropriate scope Arnaldo Carvalho de Melo
2011-08-12 16:29 ` [PATCH 10/12] perf probe: Avoid searching variables in intermediate scopes Arnaldo Carvalho de Melo
2011-08-12 16:29 ` [PATCH 11/12] perf probe: Search concrete out-of-line instances Arnaldo Carvalho de Melo
2011-08-12 16:29 ` [PATCH 12/12] perf probe: Filter out redundant inline-instances Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313166544-6209-5-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=penberg@kernel.org \
--cc=peterz@infradead.org \
--cc=yrl.pp-manager.tt@hitachi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®