From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933102AbdKAOmr (ORCPT <rfc822;w@1wt.eu>);
        Wed, 1 Nov 2017 10:42:47 -0400
Received: from mail.kernel.org ([198.145.29.99]:55098 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S932481AbdKAOmp (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 1 Nov 2017 10:42:45 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5EBD02191E
Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org
Date: Wed, 1 Nov 2017 11:42:41 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>, Ingo Molnar <mingo@kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>, Jiri Olsa <jolsa@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>, kernel-team@lge.com,
        Jin Yao <yao.jin@linux.intel.com>,
        Milian Wolff <milian.wolff@kdab.com>
Subject: Re: [PATCH 1/2] perf tools: Fix memory leak in addr2inlines()
Message-ID: <20171101144241.GD3531@kernel.org>
References: <20171031020654.31163-1-namhyung@kernel.org>
 <20171101121357.GA20353@krava>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171101121357.GA20353@krava>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.9.1 (2017-09-22)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Em Wed, Nov 01, 2017 at 01:13:57PM +0100, Jiri Olsa escreveu:
> On Tue, Oct 31, 2017 at 11:06:53AM +0900, Namhyung Kim wrote:
> > 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.
> > 
> > Cc: Jin Yao <yao.jin@linux.intel.com>
> > Cc: Milian Wolff <milian.wolff@kdab.com>
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> 
> Acked-by: Jiri Olsa <jolsa@kernel.org>

Thanks, added this and the Reviewed-by to 2/2.

- Arnaldo
 
> jirka
> 
> > ---
> >  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 c143c3bc1ef8..51dc49c65476 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;
> >  }
> > -- 
> > 2.14.3
> >