public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [perf PATCH 2/3] Fix memory leak for the "Not caching a kptr_restrict'ed /proc/kallsyms\n" case
@ 2013-01-25 10:21 Thomas Jarosch
  2013-01-31 11:03 ` [tip:perf/core] perf header: Fix memory leak for the " Not caching a kptr_restrict'ed /proc/kallsyms" case tip-bot for Thomas Jarosch
  0 siblings, 1 reply; 2+ messages in thread
From: Thomas Jarosch @ 2013-01-25 10:21 UTC (permalink / raw)
  To: acme; +Cc: linux-kernel

cppcheck reported:
[util/header.c:316]: (error) Memory leak: filename
[util/header.c:316]: (error) Memory leak: linkname

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
---
 tools/perf/util/header.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index e17a8fe..7b24cf3 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -313,7 +313,8 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
 	if (is_kallsyms) {
 		if (symbol_conf.kptr_restrict) {
 			pr_debug("Not caching a kptr_restrict'ed /proc/kallsyms\n");
-			return 0;
+			err = 0;
+			goto out_free;
 		}
 		realname = (char *) name;
 	} else
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip:perf/core] perf header: Fix memory leak for the " Not caching a kptr_restrict'ed /proc/kallsyms" case
  2013-01-25 10:21 [perf PATCH 2/3] Fix memory leak for the "Not caching a kptr_restrict'ed /proc/kallsyms\n" case Thomas Jarosch
@ 2013-01-31 11:03 ` tip-bot for Thomas Jarosch
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Thomas Jarosch @ 2013-01-31 11:03 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: acme, linux-kernel, hpa, mingo, thomas.jarosch, tglx

Commit-ID:  fdae6373910c10e27b8ae07e11e821b183d0bba5
Gitweb:     http://git.kernel.org/tip/fdae6373910c10e27b8ae07e11e821b183d0bba5
Author:     Thomas Jarosch <thomas.jarosch@intra2net.com>
AuthorDate: Fri, 25 Jan 2013 11:21:39 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 30 Jan 2013 10:40:18 -0300

perf header: Fix memory leak for the "Not caching a kptr_restrict'ed /proc/kallsyms" case

cppcheck reported:
[util/header.c:316]: (error) Memory leak: filename
[util/header.c:316]: (error) Memory leak: linkname

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Link: http://lkml.kernel.org/r/9377388.0eFDp53iW6@storm
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/header.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index e17a8fe..7b24cf3 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -313,7 +313,8 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
 	if (is_kallsyms) {
 		if (symbol_conf.kptr_restrict) {
 			pr_debug("Not caching a kptr_restrict'ed /proc/kallsyms\n");
-			return 0;
+			err = 0;
+			goto out_free;
 		}
 		realname = (char *) name;
 	} else

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-31 11:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-25 10:21 [perf PATCH 2/3] Fix memory leak for the "Not caching a kptr_restrict'ed /proc/kallsyms\n" case Thomas Jarosch
2013-01-31 11:03 ` [tip:perf/core] perf header: Fix memory leak for the " Not caching a kptr_restrict'ed /proc/kallsyms" case tip-bot for Thomas Jarosch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox