From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753465AbcD0Pg3 (ORCPT ); Wed, 27 Apr 2016 11:36:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51090 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230AbcD0PfQ (ORCPT ); Wed, 27 Apr 2016 11:35:16 -0400 Date: Wed, 27 Apr 2016 08:34:46 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, mhiramat@kernel.org Reply-To: peterz@infradead.org, namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, mhiramat@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20160426064737.1443.44093.stgit@devbox> References: <20160426064737.1443.44093.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Close target file on error path Git-Commit-ID: 062d6c2aec0e087be956494a73221c04eca115fe X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 062d6c2aec0e087be956494a73221c04eca115fe Gitweb: http://git.kernel.org/tip/062d6c2aec0e087be956494a73221c04eca115fe Author: Masami Hiramatsu AuthorDate: Tue, 26 Apr 2016 15:47:37 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 26 Apr 2016 10:56:08 -0300 perf probe: Close target file on error path Fix a bug to close target elf file in get_text_start_address(). Signed-off-by: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20160426064737.1443.44093.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo --- 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 8319fbb..97b7f8e 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; }