mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@redhat.com>, <ast@plumgrid.com>
Cc: <brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
	<dsahern@gmail.com>, <hekuang@huawei.com>, <jolsa@kernel.org>,
	<xiakaixu@huawei.com>, <masami.hiramatsu.pt@hitachi.com>,
	<namhyung@kernel.org>, <a.p.zijlstra@chello.nl>,
	<lizefan@huawei.com>, <pi3orama@163.com>,
	<linux-kernel@vger.kernel.org>, Wang Nan <wangnan0@huawei.com>,
	"Paul Mackerras" <paulus@samba.org>
Subject: [PATCH 21/32] perf probe: Reset args and nargs for probe_trace_event when failure
Date: Fri, 28 Aug 2015 07:05:59 +0000	[thread overview]
Message-ID: <1440745570-150857-22-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1440745570-150857-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 further, 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/1436445342-1402-31-git-send-email-wangnan0@huawei.com
---
 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 29c43c068..5ab9cd6 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1228,6 +1228,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;
 }
 
-- 
2.1.0


  parent reply	other threads:[~2015-08-28  7:12 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-28  7:05 [GIT PULL 00/32] perf tools: filtering events using eBPF programs Wang Nan
2015-08-28  7:05 ` [PATCH 01/32] bpf tools: New API to get name from a BPF object Wang Nan
2015-08-28  7:05 ` [PATCH 02/32] perf tools: Don't set cmdline_group_boundary if no evsel is collected Wang Nan
2015-08-28  7:05 ` [PATCH 03/32] perf tools: Introduce dummy evsel Wang Nan
2015-08-28  7:05 ` [PATCH 04/32] perf tools: Make perf depend on libbpf Wang Nan
2015-08-28  7:05 ` [PATCH 05/32] perf ebpf: Add the libbpf glue Wang Nan
2015-08-28  7:05 ` [PATCH 06/32] perf tools: Enable passing bpf object file to --event Wang Nan
2015-08-29  0:50   ` Wangnan (F)
2015-08-28  7:05 ` [PATCH 07/32] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-08-28  7:05 ` [PATCH 08/32] perf record, bpf: Parse and probe eBPF programs probe points Wang Nan
2015-08-28  7:05 ` [PATCH 09/32] perf bpf: Collect 'struct perf_probe_event' for bpf_program Wang Nan
2015-08-28  7:05 ` [PATCH 10/32] perf record: Load all eBPF object into kernel Wang Nan
2015-08-28  7:05 ` [PATCH 11/32] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-08-28  7:05 ` [PATCH 12/32] perf tools: Allow filter option to be applied to bof object Wang Nan
2015-08-28  7:05 ` [PATCH 13/32] perf tools: Attach eBPF program to perf event Wang Nan
2015-08-28  7:05 ` [PATCH 14/32] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-08-28  7:05 ` [PATCH 15/32] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-08-28  7:05 ` [PATCH 16/32] perf tools: Infrastructure for compiling scriptlets when passing '.c' to --event Wang Nan
2015-08-28  7:05 ` [PATCH 17/32] perf tests: Enforce LLVM test for BPF test Wang Nan
2015-08-28  7:05 ` [PATCH 18/32] perf test: Add 'perf test BPF' Wang Nan
2015-08-28  7:05 ` [PATCH 19/32] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-08-28  7:05 ` [PATCH 20/32] perf tools: Fix probe-event.h include Wang Nan
2015-08-28  7:05 ` Wang Nan [this message]
2015-08-28  7:06 ` [PATCH 22/32] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-08-28  7:06 ` [PATCH 23/32] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-08-28  7:06 ` [PATCH 24/32] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-08-28  7:06 ` [PATCH 25/32] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-08-28  7:06 ` [PATCH 26/32] perf tools: Generate prologue for BPF programs Wang Nan
2015-08-28  7:06 ` [PATCH 27/32] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-08-28  7:06 ` [PATCH 28/32] perf record: Support custom vmlinux path Wang Nan
2015-08-28  7:06 ` [PATCH 29/32] perf probe: Init symbol as kprobe Wang Nan
2015-08-28  7:06 ` [PATCH 30/32] perf tools: Support attach BPF program on uprobe events Wang Nan
2015-08-28  7:06 ` [PATCH 31/32] tools lib traceevent: Support function __get_dynamic_array_len Wang Nan
2015-08-29  0:29   ` Alexei Starovoitov
2015-08-28  7:06 ` [PATCH 32/32] bpf: Introduce function for outputing data to perf event Wang Nan
2015-08-29  0:45   ` Alexei Starovoitov
2015-08-29  1:19     ` Wangnan (F)
2015-08-29  1:34       ` Alexei Starovoitov
2015-08-29  2:15         ` Wangnan (F)
2015-08-29  2:22           ` Alexei Starovoitov
2015-08-29  2:36             ` Wangnan (F)
2015-08-29  2:49               ` Alexei Starovoitov
2015-08-29  2:50                 ` Wangnan (F)
2015-08-29  0:25 ` [GIT PULL 00/32] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-08-31 13:59   ` Arnaldo Carvalho de Melo
2015-08-31 14:07     ` Wangnan (F)

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=1440745570-150857-22-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

all inboxes | Powered by JetHome®