Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Date:   Tue, 15 Oct 2019 12:08:39 -0300
To:     Jiri Olsa <jolsa@redhat.com>
Cc:     Yunfeng Ye <yeyunfeng@huawei.com>, peterz@infradead.org,
        mingo@redhat.com, mark.rutland@arm.com,
        alexander.shishkin@linux.intel.com, namhyung@kernel.org,
        linux-kernel@vger.kernel.org, hushiyuan@huawei.com,
        linfeilong@huawei.com
Subject: Re: [PATCH] perf c2c: fix memory leak in build_cl_output()
Message-ID: <20191015150839.GC25820@kernel.org>
References: <4d3c0178-5482-c313-98e1-f82090d2d456@huawei.com>
 <20191015084753.GD10951@krava>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20191015084753.GD10951@krava>
User-Agent: Mutt/1.12.1 (2019-06-15)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Em Tue, Oct 15, 2019 at 10:47:53AM +0200, Jiri Olsa escreveu:
> On Tue, Oct 15, 2019 at 10:54:14AM +0800, Yunfeng Ye wrote:
> > There is a memory leak problem in the failure paths of
> > build_cl_output(), so fix it.
> > 
> > Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
> 
> Acked-by: Jiri Olsa <jolsa@kernel.org>

Thanks, applied to perf/urgent.

- Arnaldo
 
> thanks,
> jirka
> 
> > ---
> >  tools/perf/builtin-c2c.c | 14 +++++++++-----
> >  1 file changed, 9 insertions(+), 5 deletions(-)
> > 
> > diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
> > index 3542b6a..e69f449 100644
> > --- a/tools/perf/builtin-c2c.c
> > +++ b/tools/perf/builtin-c2c.c
> > @@ -2635,6 +2635,7 @@ static int build_cl_output(char *cl_sort, bool no_source)
> >  	bool add_sym   = false;
> >  	bool add_dso   = false;
> >  	bool add_src   = false;
> > +	int ret = 0;
> > 
> >  	if (!buf)
> >  		return -ENOMEM;
> > @@ -2653,7 +2654,8 @@ static int build_cl_output(char *cl_sort, bool no_source)
> >  			add_dso = true;
> >  		} else if (strcmp(tok, "offset")) {
> >  			pr_err("unrecognized sort token: %s\n", tok);
> > -			return -EINVAL;
> > +			ret = -EINVAL;
> > +			goto err;
> >  		}
> >  	}
> > 
> > @@ -2676,13 +2678,15 @@ static int build_cl_output(char *cl_sort, bool no_source)
> >  		add_sym ? "symbol," : "",
> >  		add_dso ? "dso," : "",
> >  		add_src ? "cl_srcline," : "",
> > -		"node") < 0)
> > -		return -ENOMEM;
> > +		"node") < 0) {
> > +		ret = -ENOMEM;
> > +		goto err;
> > +	}
> > 
> >  	c2c.show_src = add_src;
> > -
> > +err:
> >  	free(buf);
> > -	return 0;
> > +	return ret;
> >  }
> > 
> >  static int setup_coalesce(const char *coalesce, bool no_source)
> > -- 
> > 2.7.4.3
> > 

-- 

- Arnaldo