Commit ae2cb1ac authored May 06, 2015 by Masami Hiramatsu Committed by Arnaldo Carvalho de Melo May 08, 2015

perf probe: Fix to close probe_events file in error



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>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: hemant@linux.vnet.ibm.com
Link: http://lkml.kernel.org/r/20150506124640.4961.26062.stgit@localhost.localdomain


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent cb307113

tools/perf/util/probe-event.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}