| Message ID | 20230822193840.1509809-1-haoluo@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 29d67fdebc42af6466d1909c60fdd1ef4f3e5240 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] libbpf: Free btf_vmlinux when closing bpf_object | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Tue, 22 Aug 2023 12:38:40 -0700 you wrote: > I hit a memory leak when testing bpf_program__set_attach_target(). > Basically, set_attach_target() may allocate btf_vmlinux, for example, > when setting attach target for bpf_iter programs. But btf_vmlinux > is freed only in bpf_object_load(), which means if we only open > bpf object but not load it, setting attach target may leak > btf_vmlinux. > > [...] Here is the summary with links: - [bpf-next] libbpf: Free btf_vmlinux when closing bpf_object https://git.kernel.org/bpf/bpf-next/c/29d67fdebc42 You are awesome, thank you!
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index b8afe2f5bc93..4c3967d94b6d 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -8423,6 +8423,7 @@ void bpf_object__close(struct bpf_object *obj) bpf_object__elf_finish(obj); bpf_object_unload(obj); btf__free(obj->btf); + btf__free(obj->btf_vmlinux); btf_ext__free(obj->btf_ext); for (i = 0; i < obj->nr_maps; i++)
I hit a memory leak when testing bpf_program__set_attach_target(). Basically, set_attach_target() may allocate btf_vmlinux, for example, when setting attach target for bpf_iter programs. But btf_vmlinux is freed only in bpf_object_load(), which means if we only open bpf object but not load it, setting attach target may leak btf_vmlinux. So let's free btf_vmlinux in bpf_object__close() anyway. Signed-off-by: Hao Luo <haoluo@google.com> --- tools/lib/bpf/libbpf.c | 1 + 1 file changed, 1 insertion(+)