mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <masami.hiramatsu.pt@hitachi.com>, <ast@kernel.org>
Cc: <lizefan@huawei.com>, <pi3orama@163.com>,
	<linux-kernel@vger.kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 01/13] perf probe: Fix memory leaking on faiulre by clearing all probe_trace_events
Date: Mon, 16 Nov 2015 12:10:03 +0000	[thread overview]
Message-ID: <1447675815-166222-2-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1447675815-166222-1-git-send-email-wangnan0@huawei.com>

From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>

Fix memory leaking on failure path in debuginfo__find_trace_events()
which frees an array of probe_trace_events but doesn't clear all
allocated sub-structures and strings.
So, before doing zfree(tevs), clear all the array elements which
can have allocated resources.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reported-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 tools/perf/util/probe-finder.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index bd8f03d..63993d7 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1246,7 +1246,7 @@ int debuginfo__find_trace_events(struct debuginfo *dbg,
 	struct trace_event_finder tf = {
 			.pf = {.pev = pev, .callback = add_probe_trace_event},
 			.max_tevs = probe_conf.max_probes, .mod = dbg->mod};
-	int ret;
+	int ret, i;
 
 	/* Allocate result tevs array */
 	*tevs = zalloc(sizeof(struct probe_trace_event) * tf.max_tevs);
@@ -1258,6 +1258,8 @@ int debuginfo__find_trace_events(struct debuginfo *dbg,
 
 	ret = debuginfo__find_probes(dbg, &tf.pf);
 	if (ret < 0) {
+		for (i = 0; i < tf.ntevs; i++)
+			clear_probe_trace_event(&tf.tevs[i]);
 		zfree(tevs);
 		return ret;
 	}
-- 
1.8.3.4


  reply	other threads:[~2015-11-16 12:48 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-16 12:10 [PATCH 00/13] perf tools: bpf: Improve BPF program ability Wang Nan
2015-11-16 12:10 ` Wang Nan [this message]
2015-11-16 12:10 ` [PATCH 02/13] perf probe: Clear probe_trace_event when add_probe_trace_event() fails Wang Nan
2015-11-16 12:10 ` [PATCH 03/13] perf tools: Allow BPF program attach to uprobe events Wang Nan
2015-11-16 14:14   ` Arnaldo Carvalho de Melo
2015-11-23 16:06   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 04/13] perf tools: Allow BPF program attach to modules Wang Nan
2015-11-23 16:06   ` [tip:perf/core] perf bpf: Allow attaching BPF programs to modules symbols tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 05/13] perf tools: Introduce strtobool() to string.c Wang Nan
2015-11-16 14:17   ` Arnaldo Carvalho de Melo
2015-11-16 14:49     ` Arnaldo Carvalho de Melo
2015-11-16 15:55       ` Arnaldo Carvalho de Melo
2015-11-23 16:04   ` [tip:perf/core] tools: Clone the kernel's strtobool function tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 06/13] perf tools: Allow BPF program config probing options Wang Nan
2015-11-23 16:06   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 07/13] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-11-16 19:02   ` Arnaldo Carvalho de Melo
2015-11-17  3:53     ` Wangnan (F)
2015-11-23 16:05   ` [tip:perf/core] " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 08/13] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-11-23 16:05   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 09/13] perf tools: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Wang Nan
2015-11-23 16:05   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 10/13] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-11-23 16:07   ` [tip:perf/core] perf bpf: " tip-bot for He Kuang
2015-11-16 12:10 ` [PATCH 11/13] perf tools: Generate prologue for BPF programs Wang Nan
2015-11-23 16:07   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 12/13] perf test: Test BPF prologue Wang Nan
2015-11-17  1:29   ` Arnaldo Carvalho de Melo
2015-11-17  1:31     ` Wangnan (F)
2015-11-17  4:38     ` Wangnan (F)
2015-11-17 12:20       ` Arnaldo Carvalho de Melo
2015-11-17  8:32     ` [PATCH 0/5] perf tools: Improve BPF support Wang Nan
2015-11-17  8:32       ` [PATCH 1/5] perf test: Fix 2 bugs in 'perf test BPF' Wang Nan
2015-11-17 12:56         ` Arnaldo Carvalho de Melo
2015-11-17 13:01           ` pi3orama
2015-11-17 13:34             ` Arnaldo Carvalho de Melo
2015-11-23 16:08         ` [tip:perf/core] perf test: Fix 'perf test BPF' when it fails to find a suitable vmlinux tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 2/5] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-11-23 16:08         ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 3/5] perf test: Print result for each subtest for llvm Wang Nan
2015-11-17 13:03         ` Arnaldo Carvalho de Melo
2015-11-23 16:09         ` [tip:perf/core] perf test: Print result for each LLVM subtest tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 4/5] perf test: Print result for each subtest for BPF Wang Nan
2015-11-23 16:09         ` [tip:perf/core] perf test: Print result for each BPF subtest tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 5/5] perf test: Mute test cases if verbose == 0 Wang Nan
2015-11-17 13:11         ` Arnaldo Carvalho de Melo
2015-11-23 16:10         ` [tip:perf/core] perf test: Mute test cases error messages " tip-bot for Wang Nan
2015-11-17  8:38     ` [PATCH 12/13] perf test: Test BPF prologue Wangnan (F)
2015-11-17  9:44     ` [PATCH] perf record: Support custom vmlinux path Wang Nan
2015-11-17 12:33       ` Arnaldo Carvalho de Melo
2015-11-17 12:42         ` Arnaldo Carvalho de Melo
2015-11-17 12:45           ` pi3orama
2015-11-19 14:03           ` [PATCH 0/2] perf tools: Builtin options related improvements Wang Nan
2015-11-19 14:03             ` [PATCH 1/2] perf tools: Always give options even it not compiled Wang Nan
2015-11-20 10:54               ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-26  8:05                 ` Wangnan (F)
2015-11-26  9:06                   ` Wangnan (F)
2015-11-19 14:03             ` [PATCH 2/2] perf record: Support custom vmlinux path Wang Nan
2015-11-23 16:08   ` [tip:perf/core] perf test: Test the BPF prologue adding infrastructure tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 13/13] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-11-17  3:05   ` Wangnan (F)
2015-11-17 13:16     ` Arnaldo Carvalho de Melo
2015-11-16 14:09 ` [PATCH 00/13] perf tools: bpf: Improve BPF program ability 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=1447675815-166222-2-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ast@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=pi3orama@163.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®