From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753446AbcHPSRD (ORCPT ); Tue, 16 Aug 2016 14:17:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38672 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752034AbcHPSQu (ORCPT ); Tue, 16 Aug 2016 14:16:50 -0400 Date: Tue, 16 Aug 2016 11:16:38 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, hpa@zytor.com, mhiramat@kernel.org, acme@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, colin.king@canonical.com, mingo@kernel.org, tglx@linutronix.de, dsahern@gmail.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com Reply-To: wangnan0@huawei.com, linux-kernel@vger.kernel.org, mhiramat@kernel.org, acme@redhat.com, jolsa@kernel.org, hpa@zytor.com, dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, colin.king@canonical.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Release resources on error when handling exit paths Git-Commit-ID: 60ebc159817fef86171616510b1228476d979556 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: 60ebc159817fef86171616510b1228476d979556 Gitweb: http://git.kernel.org/tip/60ebc159817fef86171616510b1228476d979556 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 15 Aug 2016 17:06:47 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 15 Aug 2016 18:10:59 -0300 perf probe: Release resources on error when handling exit paths Cc: Adrian Hunter Cc: Colin King Cc: David Ahern Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-zh2j4iqimralugke5qq7dn6d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-file.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index a8e7623..9c3b9ed 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -143,6 +143,8 @@ struct strlist *probe_file__get_rawlist(int fd) return NULL; sl = strlist__new(NULL, NULL); + if (sl == NULL) + return NULL; fddup = dup(fd); if (fddup < 0) @@ -163,14 +165,16 @@ struct strlist *probe_file__get_rawlist(int fd) ret = strlist__add(sl, buf); if (ret < 0) { pr_debug("strlist__add failed (%d)\n", ret); - strlist__delete(sl); - return NULL; + goto out_close_fp; } } fclose(fp); return sl; +out_close_fp: + fclose(fp); + goto out_free_sl; out_close_fddup: close(fddup); out_free_sl: @@ -467,8 +471,10 @@ static int probe_cache__load(struct probe_cache *pcache) if (fddup < 0) return -errno; fp = fdopen(fddup, "r"); - if (!fp) + if (!fp) { + close(fddup); return -EINVAL; + } while (!feof(fp)) { if (!fgets(buf, MAX_CMDLEN, fp))