diff options
author | Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> | 2011-08-11 07:02:29 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-08-12 08:21:15 -0400 |
commit | 8afa2a707d3d1320df5d35966729ac5262da737d (patch) | |
tree | 92126a1e215cb43bd1f29db65e33f9ad3c5fd5e9 /tools | |
parent | e9b52ef2228cd0bed7a4465c693a39489e2c338d (diff) |
perf probe: Fix a memory leak for scopes array
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>
Diffstat (limited to 'tools')
-rw-r--r-- | 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 3e44a3e36519..573c72363223 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) | |||
660 | else { | 660 | else { |
661 | /* Search upper class */ | 661 | /* Search upper class */ |
662 | nscopes = dwarf_getscopes_die(sp_die, &scopes); | 662 | nscopes = dwarf_getscopes_die(sp_die, &scopes); |
663 | ret = -ENOENT; | ||
663 | while (nscopes-- > 1) { | 664 | while (nscopes-- > 1) { |
664 | pr_debug("Searching variables in %s\n", | 665 | pr_debug("Searching variables in %s\n", |
665 | dwarf_diename(&scopes[nscopes])); | 666 | dwarf_diename(&scopes[nscopes])); |
@@ -668,14 +669,12 @@ static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf) | |||
668 | pf->pvar->var, 0, | 669 | pf->pvar->var, 0, |
669 | &vr_die)) { | 670 | &vr_die)) { |
670 | ret = convert_variable(&vr_die, pf); | 671 | ret = convert_variable(&vr_die, pf); |
671 | goto found; | 672 | break; |
672 | } | 673 | } |
673 | } | 674 | } |
674 | if (scopes) | 675 | if (scopes) |
675 | free(scopes); | 676 | free(scopes); |
676 | ret = -ENOENT; | ||
677 | } | 677 | } |
678 | found: | ||
679 | if (ret < 0) | 678 | if (ret < 0) |
680 | pr_warning("Failed to find '%s' in this function.\n", | 679 | pr_warning("Failed to find '%s' in this function.\n", |
681 | pf->pvar->var); | 680 | pf->pvar->var); |