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;
Date:   Tue, 15 Oct 2019 10:47:53 +0200
From:   Jiri Olsa <jolsa@redhat.com>
To:     Yunfeng Ye <yeyunfeng@huawei.com>
Cc:     peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
        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: <20191015084753.GD10951@krava>
References: <4d3c0178-5482-c313-98e1-f82090d2d456@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4d3c0178-5482-c313-98e1-f82090d2d456@huawei.com>
User-Agent: Mutt/1.12.1 (2019-06-15)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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,
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
>