diff options
| author | Masami Hiramatsu | 2015-05-06 14:46:40 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2015-05-08 21:05:01 +0200 |
| commit | ae2cb1ac60758e99cec15e9edd68e0d22bfd310e (patch) | |
| tree | 342c779799f7ec15dba10bc7f074a14f7e688ea5 /tools/perf/util/probe-event.c | |
| parent | perf_event: Don't allow vmalloc() backed perf on powerpc (diff) | |
| download | kernel-qcow2-linux-ae2cb1ac60758e99cec15e9edd68e0d22bfd310e.tar.gz kernel-qcow2-linux-ae2cb1ac60758e99cec15e9edd68e0d22bfd310e.tar.xz kernel-qcow2-linux-ae2cb1ac60758e99cec15e9edd68e0d22bfd310e.zip | |
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>
Diffstat (limited to 'tools/perf/util/probe-event.c')
| -rw-r--r-- | tools/perf/util/probe-event.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index abf5845a2acc..230353f1bea2 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; } |