From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: ananth@in.ibm.com, Peter Zijlstra <peterz@infradead.org>,
hemant@linux.vnet.ibm.com,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>,
namhyung@kernel.org, Jiri Olsa <jolsa@redhat.com>,
Ingo Molnar <mingo@kernel.org>
Subject: [PATCH perf/core 1/8] [BUGFIX] perf probe: Fix to close probe_events file in error
Date: Wed, 06 May 2015 21:46:40 +0900 [thread overview]
Message-ID: <20150506124640.4961.26062.stgit@localhost.localdomain> (raw)
In-Reply-To: <20150506124638.4961.3172.stgit@localhost.localdomain>
Fix perf-probe to close probe_events file if it failed to
get existing probe's name. This also fix the return error
code to -ENOMEM.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
tools/perf/util/probe-event.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index abf5845..230353f 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2384,7 +2384,8 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
namelist = get_probe_trace_event_names(fd, false);
if (!namelist) {
pr_debug("Failed to get current event list.\n");
- return -EIO;
+ ret = -ENOMEM;
+ goto close_out;
}
/* Get kprobe blacklist if exists */
if (!pev->uprobes) {
@@ -2467,6 +2468,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
kprobe_blacklist__delete(&blacklist);
strlist__delete(namelist);
+close_out:
close(fd);
return ret;
}
next prev parent reply other threads:[~2015-05-06 12:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-06 12:46 [PATCH perf/core 0/8] perf-probe bugfixes and support wildcard for probe points Masami Hiramatsu
2015-05-06 12:46 ` Masami Hiramatsu [this message]
2015-05-10 7:04 ` [tip:perf/core] perf probe: Fix to close probe_events file in error tip-bot for Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 2/8] [BUGFIX] perf probe: Fix a typo for the flags of open Masami Hiramatsu
2015-05-10 7:04 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 3/8] [BUGFIX] perf probe: Fix to return 0 when positive value returned Masami Hiramatsu
2015-05-10 7:04 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 4/8] [BUGFIX] perf probe: --line checks valid C-style function name Masami Hiramatsu
2015-05-10 7:04 ` [tip:perf/core] perf probe: Make --line checks validate " tip-bot for Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 5/8] perf probe: Skip kernel symbols which is out of .text Masami Hiramatsu
2015-05-10 7:05 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 6/8] perf-probe: Add --no-inlines option to avoid searching inline functions Masami Hiramatsu
2015-05-06 15:52 ` Arnaldo Carvalho de Melo
2015-05-06 23:22 ` Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 7/8] perf-probe: Support $params special probe argument Masami Hiramatsu
2015-05-10 7:05 ` [tip:perf/core] perf probe: " tip-bot for Masami Hiramatsu
2015-05-06 12:46 ` [PATCH perf/core 8/8] perf-probe: Support glob wildcards for function name Masami Hiramatsu
2015-05-06 16:19 ` [PATCH perf/core 0/8] perf-probe bugfixes and support wildcard for probe points 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=20150506124640.4961.26062.stgit@localhost.localdomain \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=acme@kernel.org \
--cc=ananth@in.ibm.com \
--cc=dsahern@gmail.com \
--cc=hemant@linux.vnet.ibm.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.