Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752243AbbEJHFH (ORCPT ); Sun, 10 May 2015 03:05:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44615 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbbEJHFC (ORCPT ); Sun, 10 May 2015 03:05:02 -0400 Date: Sun, 10 May 2015 00:04:07 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: acme@redhat.com, tglx@linutronix.de, jolsa@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, ananth@in.ibm.com, masami.hiramatsu.pt@hitachi.com, peterz@infradead.org, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com Reply-To: masami.hiramatsu.pt@hitachi.com, peterz@infradead.org, namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, ananth@in.ibm.com In-Reply-To: <20150506124640.4961.26062.stgit@localhost.localdomain> References: <20150506124640.4961.26062.stgit@localhost.localdomain> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Fix to close probe_events file in error Git-Commit-ID: ae2cb1ac60758e99cec15e9edd68e0d22bfd310e 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 Content-Length: 2011 Lines: 52 Commit-ID: ae2cb1ac60758e99cec15e9edd68e0d22bfd310e Gitweb: http://git.kernel.org/tip/ae2cb1ac60758e99cec15e9edd68e0d22bfd310e Author: Masami Hiramatsu AuthorDate: Wed, 6 May 2015 21:46:40 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 May 2015 16:05:01 -0300 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 Cc: Ananth N Mavinakayanahalli Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra 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 --- 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/