path: root/tools
diff options
authorNikita V. Shirokov <tehnerd@tehnerd.com>2019-03-08 05:18:14 +0000
committerDaniel Borkmann <daniel@iogearbox.net>2019-03-08 21:16:36 +0100
commit243b4cdab981d7004bee56c38e18a29da32ef104 (patch)
tree0a2e293600e43da600aaaccfbcf9fdea971d5870 /tools
parentbpf: fix replace_map_fd_with_map_ptr's ldimm64 second imm field (diff)
bpf, libbpf: fixing leak when kernel does not support btf
We could end up in situation when we have object file w/ all btf info, but kernel does not support btf yet. In this situation currently libbpf just set obj->btf to NULL w/o freeing it first. This patch is fixing it by making sure to run btf__free first. Fixes: d29d87f7e612 ("btf: separate btf creation and loading") Signed-off-by: Nikita V. Shirokov <tehnerd@tehnerd.com> Acked-by: Yonghong Song <yhs@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools')
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index f5eb60379c8d..d5b830d60601 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -838,6 +838,8 @@ static int bpf_object__elf_collect(struct bpf_object *obj, int flags)
if (IS_ERR(obj->btf) || btf__load(obj->btf)) {
pr_warning("Error loading ELF section %s: %ld. Ignored and continue.\n",
BTF_ELF_SEC, PTR_ERR(obj->btf));
+ if (!IS_ERR(obj->btf))
+ btf__free(obj->btf);
obj->btf = NULL;
} else if (strcmp(name, BTF_EXT_ELF_SEC) == 0) {