Re: [PATCH 1/1] perf probe: Free string returned by synthesize_perf_probe_point() on failure in synthesize_perf_probe_command()

[Masami Hiramatsu (Google) <mhiramat@kernel.org>]

On Fri, 4 Aug 2023 13:26:54 -0300
Arnaldo Carvalho de Melo <acme@kernel.org> wrote:

> Building perf with EXTRA_CFLAGS="-fsanitize=address" a leak was detected
> elsewhere and lead to an audit, where we found that
> synthesize_perf_probe_command() may leak synthesize_perf_probe_point()
> return on failure, fix it.

This looks good to me.

Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thanks,

> 
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Ian Rogers <irogers@google.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Link: https://lore.kernel.org/lkml/
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/util/probe-event.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index c7bfeab610a3679a..2835d87cb97771f9 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2063,14 +2063,18 @@ char *synthesize_perf_probe_command(struct perf_probe_event *pev)
>  			goto out;
>  
>  	tmp = synthesize_perf_probe_point(&pev->point);
> -	if (!tmp || strbuf_addstr(&buf, tmp) < 0)
> +	if (!tmp || strbuf_addstr(&buf, tmp) < 0) {
> +		free(tmp);
>  		goto out;
> +	}
>  	free(tmp);
>  
>  	for (i = 0; i < pev->nargs; i++) {
>  		tmp = synthesize_perf_probe_arg(pev->args + i);
> -		if (!tmp || strbuf_addf(&buf, " %s", tmp) < 0)
> +		if (!tmp || strbuf_addf(&buf, " %s", tmp) < 0) {
> +			free(tmp);
>  			goto out;
> +		}
>  		free(tmp);
>  	}
>  
> -- 
> 2.37.1
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>