Re: [PATCH] perf annotate: Fix multiple memory and file descriptor leaks

[Jiri Olsa <jolsa@redhat.com>]

On Mon, Oct 14, 2019 at 12:10:47PM -0500, Gustavo A. R. Silva wrote:
> Store SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF in variable *ret*, instead
> of returning in the middle of the function and leaking multiple
> resources: prog_linfo, btf, s and bfdf.
> 
> Addresses-Coverity-ID: 1454832 ("Structurally dead code")
> Fixes: 11aad897f6d1 ("perf annotate: Don't return -1 for error when doing BPF disassembly")
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

> ---
>  tools/perf/util/annotate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 4036c7f7b0fb..e42bf572358c 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1758,7 +1758,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
>  	info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env,
>  						 dso->bpf_prog.id);
>  	if (!info_node) {
> -		return SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
> +		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
>  		goto out;
>  	}
>  	info_linear = info_node->info_linear;
> -- 
> 2.23.0
>