From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933077AbdKCO0N (ORCPT ); Fri, 3 Nov 2017 10:26:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54431 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751744AbdKCO0M (ORCPT ); Fri, 3 Nov 2017 10:26:12 -0400 Date: Fri, 3 Nov 2017 07:23:37 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: peterz@infradead.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, milian.wolff@kdab.com, yao.jin@linux.intel.com, tglx@linutronix.de, acme@redhat.com, hpa@zytor.com Reply-To: tglx@linutronix.de, acme@redhat.com, hpa@zytor.com, yao.jin@linux.intel.com, milian.wolff@kdab.com, mingo@kernel.org, jolsa@kernel.org, namhyung@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org In-Reply-To: <20171031020654.31163-1-namhyung@kernel.org> References: <20171031020654.31163-1-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf srcline: Fix memory leak in addr2inlines() Git-Commit-ID: b7b75a60b291cc699ca9bb2a8517a1b3b08bbeb1 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: b7b75a60b291cc699ca9bb2a8517a1b3b08bbeb1 Gitweb: https://git.kernel.org/tip/b7b75a60b291cc699ca9bb2a8517a1b3b08bbeb1 Author: Namhyung Kim AuthorDate: Tue, 31 Oct 2017 11:06:53 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 1 Nov 2017 11:43:56 -0300 perf srcline: Fix memory leak in addr2inlines() When libbfd is not used, addr2inlines() executes `addr2line -i` and process output line by line. But it resets filename to NULL in the loop so getline() allocates additional memory everytime instead of realloc. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Jin Yao Cc: Milian Wolff Cc: Peter Zijlstra Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20171031020654.31163-1-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/srcline.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index c143c3b..51dc49c 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -456,20 +456,17 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr, while (getline(&filename, &len, fp) != -1) { char *srcline; - if (filename_split(filename, &line_nr) != 1) { - free(filename); + if (filename_split(filename, &line_nr) != 1) goto out; - } srcline = srcline_from_fileline(filename, line_nr); if (inline_list__append(sym, srcline, node) != 0) goto out; - - filename = NULL; } out: pclose(fp); + free(filename); return node; }