From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753408AbcHPSQu (ORCPT ); Tue, 16 Aug 2016 14:16:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38668 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752602AbcHPSQs (ORCPT ); Tue, 16 Aug 2016 14:16:48 -0400 Date: Tue, 16 Aug 2016 11:16:12 -0700 From: tip-bot for Colin Ian King Message-ID: Cc: acme@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, jolsa@kernel.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, alexander.shishkin@linux.intel.com, mhiramat@kernel.org, colin.king@canonical.com, wangnan0@huawei.com Reply-To: peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, tglx@linutronix.de, jolsa@kernel.org, mingo@kernel.org, hpa@zytor.com, mhiramat@kernel.org, alexander.shishkin@linux.intel.com, wangnan0@huawei.com, colin.king@canonical.com In-Reply-To: <1471038296-12956-1-git-send-email-colin.king@canonical.com> References: <1471038296-12956-1-git-send-email-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Check for dup and fdopen failures Git-Commit-ID: 0325862dc364d8af524bf2db53ef4360ed55b989 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: 0325862dc364d8af524bf2db53ef4360ed55b989 Gitweb: http://git.kernel.org/tip/0325862dc364d8af524bf2db53ef4360ed55b989 Author: Colin Ian King AuthorDate: Fri, 12 Aug 2016 22:44:56 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 15 Aug 2016 17:06:19 -0300 perf probe: Check for dup and fdopen failures dup and fdopen can potentially fail, so add some extra error handling checks rather than assuming they always work. Signed-off-by: Colin King Acked-by: Masami Hiramatsu Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1471038296-12956-1-git-send-email-colin.king@canonical.com [ Free resources when those functions (now being verified) fail ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-file.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 9aed9c3..a8e7623 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -133,7 +133,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag) /* Get raw string list of current kprobe_events or uprobe_events */ struct strlist *probe_file__get_rawlist(int fd) { - int ret, idx; + int ret, idx, fddup; FILE *fp; char buf[MAX_CMDLEN]; char *p; @@ -144,7 +144,14 @@ struct strlist *probe_file__get_rawlist(int fd) sl = strlist__new(NULL, NULL); - fp = fdopen(dup(fd), "r"); + fddup = dup(fd); + if (fddup < 0) + goto out_free_sl; + + fp = fdopen(fddup, "r"); + if (!fp) + goto out_close_fddup; + while (!feof(fp)) { p = fgets(buf, MAX_CMDLEN, fp); if (!p) @@ -163,6 +170,12 @@ struct strlist *probe_file__get_rawlist(int fd) fclose(fp); return sl; + +out_close_fddup: + close(fddup); +out_free_sl: + strlist__delete(sl); + return NULL; } static struct strlist *__probe_file__get_namelist(int fd, bool include_group) @@ -447,10 +460,13 @@ static int probe_cache__load(struct probe_cache *pcache) { struct probe_cache_entry *entry = NULL; char buf[MAX_CMDLEN], *p; - int ret = 0; + int ret = 0, fddup; FILE *fp; - fp = fdopen(dup(pcache->fd), "r"); + fddup = dup(pcache->fd); + if (fddup < 0) + return -errno; + fp = fdopen(fddup, "r"); if (!fp) return -EINVAL;