From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752139AbdFHWyr (ORCPT ); Thu, 8 Jun 2017 18:54:47 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37401 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbdFHWyp (ORCPT ); Thu, 8 Jun 2017 18:54:45 -0400 Date: Thu, 8 Jun 2017 15:52:17 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, dsahern@gmail.com, mingo@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, wangnan0@huawei.com, jolsa@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, acme@redhat.com Reply-To: dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com In-Reply-To: <20170608073109.30699-7-namhyung@kernel.org> References: <20170608073109.30699-7-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Consolidate error path in __open_dso() Git-Commit-ID: 8ba29adf9a7cdff3c7283d5fc0dcf5e777d3b40f 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: 8ba29adf9a7cdff3c7283d5fc0dcf5e777d3b40f Gitweb: http://git.kernel.org/tip/8ba29adf9a7cdff3c7283d5fc0dcf5e777d3b40f Author: Namhyung Kim AuthorDate: Thu, 8 Jun 2017 16:31:06 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Jun 2017 15:39:13 -0300 perf tools: Consolidate error path in __open_dso() On failure, it should free the 'name', so clean up the error path using goto. Signed-off-by: Namhyung Kim Suggested-by: Arnaldo Carvalho de Melo Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Peter Zijlstra Cc: Wang Nan Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20170608073109.30699-7-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index c63525d..4e7ab61 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -454,7 +454,7 @@ static int do_open(char *name) static int __open_dso(struct dso *dso, struct machine *machine) { - int fd; + int fd = -EINVAL; char *root_dir = (char *)""; char *name = malloc(PATH_MAX); @@ -465,23 +465,19 @@ static int __open_dso(struct dso *dso, struct machine *machine) root_dir = machine->root_dir; if (dso__read_binary_type_filename(dso, dso->binary_type, - root_dir, name, PATH_MAX)) { - free(name); - return -EINVAL; - } + root_dir, name, PATH_MAX)) + goto out; - if (!is_regular_file(name)) { - free(name); - return -EINVAL; - } + if (!is_regular_file(name)) + goto out; if (dso__needs_decompress(dso)) { char newpath[KMOD_DECOMP_LEN]; size_t len = sizeof(newpath); if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) { - free(name); - return -dso->load_errno; + fd = -dso->load_errno; + goto out; } strcpy(name, newpath); @@ -492,6 +488,7 @@ static int __open_dso(struct dso *dso, struct machine *machine) if (dso__needs_decompress(dso)) unlink(name); +out: free(name); return fd; }