libbpf: Fix huge memory leak in libbpf_find_vmlinux_btf_id()
authorAndrii Nakryiko <andriin@fb.com>
Wed, 29 Apr 2020 01:21:08 +0000 (18:21 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 29 Apr 2020 02:48:05 +0000 (19:48 -0700)
BTF object wasn't freed.

Fixes: a6ed02cac690 ("libbpf: Load btf_vmlinux only once per object.")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Cc: KP Singh <kpsingh@google.com>
Link: https://lore.kernel.org/bpf/20200429012111.277390-9-andriin@fb.com
tools/lib/bpf/libbpf.c

index 445ee90..d86ff82 100644 (file)
@@ -6934,6 +6934,7 @@ int libbpf_find_vmlinux_btf_id(const char *name,
                               enum bpf_attach_type attach_type)
 {
        struct btf *btf;
+       int err;
 
        btf = libbpf_find_kernel_btf();
        if (IS_ERR(btf)) {
@@ -6941,7 +6942,9 @@ int libbpf_find_vmlinux_btf_id(const char *name,
                return -EINVAL;
        }
 
-       return __find_vmlinux_btf_id(btf, name, attach_type);
+       err = __find_vmlinux_btf_id(btf, name, attach_type);
+       btf__free(btf);
+       return err;
 }
 
 static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd)