Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf annotate: Fix multiple memory and file descriptor leaks

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>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20191014171047.GA30850@embeddedor
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Gustavo A. R. Silva and committed by
Arnaldo Carvalho de Melo
f948eb45 6080728f

+1 -1
+1 -1
tools/perf/util/annotate.c
··· 1758 1758 info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env, 1759 1759 dso->bpf_prog.id); 1760 1760 if (!info_node) { 1761 - return SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF; 1761 + ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF; 1762 1762 goto out; 1763 1763 } 1764 1764 info_linear = info_node->info_linear;