From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbdFHWw2 (ORCPT ); Thu, 8 Jun 2017 18:52:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:44061 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbdFHWw0 (ORCPT ); Thu, 8 Jun 2017 18:52:26 -0400 Date: Thu, 8 Jun 2017 15:50:05 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, acme@redhat.com, mingo@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, jolsa@kernel.org, dsahern@gmail.com Reply-To: adrian.hunter@intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, wangnan0@huawei.com, mingo@kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, jolsa@kernel.org, dsahern@gmail.com In-Reply-To: <20170608073109.30699-3-namhyung@kernel.org> References: <20170608073109.30699-3-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Fix a memory leak in __open_dso() Git-Commit-ID: 44ad6b8852529eb39066edbedc027a6901da6803 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: 44ad6b8852529eb39066edbedc027a6901da6803 Gitweb: http://git.kernel.org/tip/44ad6b8852529eb39066edbedc027a6901da6803 Author: Namhyung Kim AuthorDate: Thu, 8 Jun 2017 16:31:02 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Jun 2017 15:38:47 -0300 perf tools: Fix a memory leak in __open_dso() The 'name' variable should be freed on the error path. Signed-off-by: Namhyung Kim 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-3-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index b27d127..1f29e4f 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -412,8 +412,10 @@ static int __open_dso(struct dso *dso, struct machine *machine) return -EINVAL; } - if (!is_regular_file(name)) + if (!is_regular_file(name)) { + free(name); return -EINVAL; + } fd = do_open(name); free(name);