linux-kernel - Re: [PATCH] perf c2c: fix memory leak in build_cl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 15 Oct 2019 10:47:53 +0200
From:   Jiri Olsa <jolsa@...hat.com>
To:     Yunfeng Ye <yeyunfeng@...wei.com>
Cc:     peterz@...radead.org, mingo@...hat.com, acme@...nel.org,
        mark.rutland@....com, alexander.shishkin@...ux.intel.com,
        namhyung@...nel.org, linux-kernel@...r.kernel.org,
        hushiyuan@...wei.com, linfeilong@...wei.com
Subject: Re: [PATCH] perf c2c: fix memory leak in build_cl_output()

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@...wei.com>

Acked-by: Jiri Olsa <jolsa@...nel.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
>