UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libbpf: Fix huge memory leak in libbpf_find_vmlinux_btf_id() 

BTF object wasn't freed.

Fixes: a6ed02cac6 ("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
This commit is contained in:
Andrii Nakryiko 2020-04-28 18:21:08 -07:00 committed by Alexei Starovoitov
parent 13c908495e
commit 3521ffa2ee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/lib/bpf/libbpf.c
View File

@ -6934,6 +6934,7 @@ int libbpf_find_vmlinux_btf_id(const char *name,
enum bpf_attach_type attach_type) enum bpf_attach_type attach_type)
{ {
struct btf *btf; struct btf *btf;
int err;
btf = libbpf_find_kernel_btf(); btf = libbpf_find_kernel_btf();
if (IS_ERR(btf)) { if (IS_ERR(btf)) {
@ -6941,7 +6942,9 @@ int libbpf_find_vmlinux_btf_id(const char *name,
return -EINVAL; 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) static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd)