From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Arnaldo Carvalho de Melo <acme@redhat.com>, Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org, yrl.pp-manager.tt@hitachi.com,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@elte.hu>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Subject: [PATCH -tip 1/5] [BUGFIX] perf-probe: Fix a memory leak for scopes array
Date: Sun, 10 Jul 2011 19:00:12 +0900 [thread overview]
Message-ID: <20110710100012.2550.4040.stgit@fedora15> (raw)
In-Reply-To: <20110710100005.2550.83138.stgit@fedora15>
Fix a memory leak for scopes array when it finds a
variable in the global scope.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
---
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 3b9d0b8..1a35637 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1177,6 +1177,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]));
@@ -1185,14 +1186,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);
next prev parent reply other threads:[~2011-07-10 10:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-10 10:00 [PATCH -tip 0/5]perf probe bugfixes Masami Hiramatsu
2011-07-10 10:00 ` Masami Hiramatsu [this message]
2011-07-10 11:00 ` [PATCH -tip 1/5] [BUGFIX] perf-probe: Fix a memory leak for scopes array Pekka Enberg
2011-07-10 10:00 ` [PATCH -tip 2/5] [BUGFIX] perf probe: Fix line walker to check CU correctly Masami Hiramatsu
2011-07-10 10:00 ` [PATCH -tip 3/5] [BUGFIX] perf probe: Fix to walk all inline instances Masami Hiramatsu
2011-07-10 10:00 ` [PATCH -tip 4/5] [BUGFIX] perf probe: Fix the order of searching scopes for variables Masami Hiramatsu
2011-07-10 11:05 ` Pekka Enberg
2011-07-10 12:08 ` Masami Hiramatsu
2011-07-10 16:26 ` Pekka Enberg
2011-07-10 17:22 ` Masami Hiramatsu
2011-07-10 10:00 ` [PATCH -tip 5/5] [BUGFIX] perf probe: Warn when more than one line are given Masami Hiramatsu
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=20110710100012.2550.4040.stgit@fedora15 \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=acme@redhat.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.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