| From a3d830d8b47f200911acd995fd8c8c3304b3a094 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 14 Oct 2019 12:10:47 -0500 |
| Subject: perf annotate: Fix multiple memory and file descriptor leaks |
| |
| From: Gustavo A. R. Silva <gustavo@embeddedor.com> |
| |
| [ Upstream commit f948eb45e3af9fb18a0487d0797a773897ef6929 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 fb8756026a805..2e02d2a0176a8 100644 |
| --- a/tools/perf/util/annotate.c |
| +++ b/tools/perf/util/annotate.c |
| @@ -1752,7 +1752,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.20.1 |
| |
