The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@redhat.com>
Cc: <linux-kernel@vger.kernel.org>, <pi3orama@163.com>,
	<lizefan@huawei.com>, Wang Nan <wangnan0@huawei.com>,
	Alexei Starovoitov <ast@plumgrid.com>,
	Brendan Gregg <brendan.d.gregg@gmail.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	David Ahern <dsahern@gmail.com>, He Kuang <hekuang@huawei.com>,
	Jiri Olsa <jolsa@kernel.org>, Kaixu Xia <xiakaixu@huawei.com>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 12/22] perf probe: Reset args and nargs for probe_trace_event when failure
Date: Thu, 8 Oct 2015 08:29:34 +0000	[thread overview]
Message-ID: <1444292984-13135-13-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1444292984-13135-1-git-send-email-wangnan0@huawei.com>

When failure occures in add_probe_trace_event(), args in
probe_trace_event is incomplete. Since information in it may be used
in futher, this patch frees the allocated memory and set it to NULL
to avoid dangling pointer.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kaixu Xia <xiakaixu@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: http://lkml.kernel.org/n/ebpf-6yw9eg0ej3l4jnqhinngkw86@git.kernel.org
---
 tools/perf/util/probe-finder.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index bd8f03d..b1581d7 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1235,6 +1235,10 @@ static int add_probe_trace_event(Dwarf_Die *sc_die, struct probe_finder *pf)
 
 end:
 	free(args);
+	if (ret) {
+		tev->nargs = 0;
+		zfree(&tev->args);
+	}
 	return ret;
 }
 
-- 
1.8.3.4


  parent reply	other threads:[~2015-10-08  8:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-08  8:29 [GIT PULL 00/22] perf tools: filtering events using eBPF programs Wang Nan
2015-10-08  8:29 ` [PATCH 01/22] perf tools: Make perf depend on libbpf Wang Nan
2015-10-08  8:29 ` [PATCH 02/22] perf ebpf: Add the libbpf glue Wang Nan
2015-10-08  8:29 ` [PATCH 03/22] perf tools: Enable passing bpf object file to --event Wang Nan
2015-10-08  8:29 ` [PATCH 04/22] perf record, bpf: Create probe points for BPF programs Wang Nan
2015-10-08  8:29 ` [PATCH 05/22] perf record: Load eBPF object into kernel Wang Nan
2015-10-08  8:29 ` [PATCH 06/22] perf tools: Collect perf_evsel in BPF object files Wang Nan
2015-10-08  8:29 ` [PATCH 07/22] perf tools: Attach eBPF program to perf event Wang Nan
2015-10-08  8:29 ` [PATCH 08/22] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-10-08  8:29 ` [PATCH 09/22] perf tools: Compile scriptlets to BPF objects when passing '.c' to --event Wang Nan
2015-10-08  8:29 ` [PATCH 10/22] perf test: Enforce LLVM test for BPF test Wang Nan
2015-10-08  8:29 ` [PATCH 11/22] perf test: Add 'perf test BPF' Wang Nan
2015-10-08  8:29 ` Wang Nan [this message]
2015-10-08  8:29 ` [PATCH 13/22] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-10-08  8:29 ` [PATCH 14/22] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-10-08  8:29 ` [PATCH 15/22] perf tools: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Wang Nan
2015-10-08  8:29 ` [PATCH 16/22] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-10-08  8:29 ` [PATCH 17/22] perf tools: Generate prologue for BPF programs Wang Nan
2015-10-08  8:29 ` [PATCH 18/22] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-10-08  8:29 ` [PATCH 19/22] perf record: Support custom vmlinux path Wang Nan
2015-10-08  8:29 ` [PATCH 20/22] perf tools: Allow BPF program attach to uprobe events Wang Nan
2015-10-08  8:29 ` [PATCH 21/22] perf test: Enforce LLVM test, add kbuild test Wang Nan
2015-10-08  8:29 ` [PATCH 22/22] perf test: Test BPF prologue Wang Nan
2015-10-08 13:45 ` [GIT PULL 00/22] perf tools: filtering events using eBPF programs 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=1444292984-13135-13-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=ast@plumgrid.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=pi3orama@163.com \
    --cc=xiakaixu@huawei.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