Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1389166
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 16/30] perf probe: Close target file on error path |
| Date | 2016-04-27 16:50 +0200 |
| Message-ID | <rsyWS-2P1-11@gated-at.bofh.it> (permalink) |
| References | <rsyNc-2L2-15@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Masami Hiramatsu <mhiramat@kernel.org>
Fix a bug to close target elf file in get_text_start_address().
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160426064737.1443.44093.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-event.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 8319fbb08636..97b7f8e5fe69 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -486,8 +486,10 @@ static int get_text_start_address(const char *exec, unsigned long *address)
return -errno;
elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
- if (elf == NULL)
- return -EINVAL;
+ if (elf == NULL) {
+ ret = -EINVAL;
+ goto out_close;
+ }
if (gelf_getehdr(elf, &ehdr) == NULL)
goto out;
@@ -499,6 +501,9 @@ static int get_text_start_address(const char *exec, unsigned long *address)
ret = 0;
out:
elf_end(elf);
+out_close:
+ close(fd);
+
return ret;
}
--
2.5.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 00/30] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 15/30] perf evlist: Enforce ring buffer reading Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 30/30] perf tools: Set the maximum allowed stack from /proc/sys/kernel/perf_event_max_stack Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 03/30] perf trace: Make --pf maj/min/all use callchains too Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 05/30] perf trace: Make --event honour --min-stack too Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 17/30] perf tools: Add lsdir() helper to read a directory Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 13/30] perf intel-pt: Fix off-by-one comparison on maximum code Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 25/30] perf probe: Fix offline module name missmatch issue Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 21/30] perf trace: Do not beautify the 'pid' parameter as a simple integer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 29/30] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:40 +0200 [PATCH 26/30] perf probe: Fix module probe issue if no dwarf support Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 14/30] perf hists: Clear dummy entry accumulated period Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 16/30] perf probe: Close target file on error path Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 09/30] tools build: Fix perf_clean target Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 08/30] perf tools: Make the x86 clean quiet Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 12/30] perf bench futex: Simplify wrapper for LOCK_PI Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 20/30] perf trace: Move perf_flags beautifier to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 27/30] perf tools: Update x86's syscall_64.tbl, adding preadv2 & pwritev2 Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 04/30] perf script: Fix segfault when printing callchains Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 19/30] perf probe: Set default kprobe group name if it is not given Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 10/30] perf tools: Remove duplicate const qualifier Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 18/30] perf probe: Let probe_file__add_event return 0 if succeeded Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 11/30] perf tests: Replace assignment with comparison on assert check Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 06/30] perf trace: Make --pf honour --min-stack too Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 02/30] perf trace: Extract evsel contructor from perf_evlist__add_pgfault Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 28/30] perf bench: Remove one more die() call Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 [PATCH 01/30] perf buildid: Fix off-by-one in write_buildid() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 16:50 +0200 Re: [GIT PULL 00/30] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-04-27 17:10 +0200
csiph-web