summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2019-10-14 13:10:47 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-10-15 11:00:01 -0400
commitf948eb45e3af9fb18a0487d0797a773897ef6929 (patch)
treefd737ed747f9e1561d1690f5c14941a2144c380e
parent6080728ff8e9c9116e52e6f840152356ac2fea56 (diff)
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>
-rw-r--r--tools/perf/util/annotate.c2
1 files changed, 1 insertions, 1 deletions
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,
1758 info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env, 1758 info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env,
1759 dso->bpf_prog.id); 1759 dso->bpf_prog.id);
1760 if (!info_node) { 1760 if (!info_node) {
1761 return SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF; 1761 ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
1762 goto out; 1762 goto out;
1763 } 1763 }
1764 info_linear = info_node->info_linear; 1764 info_linear = info_node->info_linear;