xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libbpf: Fix the possible memory leak on error

Browse Source 
[ Upstream commit 18353c87e0e0440d4c7c746ed740738bbc1b538e ]

If the strdup() fails then we need to call bpf_object__close(obj) to
avoid a resource leak.

Fixes: 166750bc1d ("libbpf: Support libbpf-provided extern variables")
Signed-off-by: Shuyi Cheng <chengshuyi@linux.alibaba.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1626180159-112996-3-git-send-email-chengshuyi@linux.alibaba.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Shuyi Cheng
2021-07-13 20:42:38 +08:00
committed by Greg Kroah-Hartman
parent f1673e8525
commit 6ca0b40891
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6907,8 +6907,10 @@ __bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz,
kconfig = OPTS_GET(opts, kconfig, NULL); kconfig = OPTS_GET(opts, kconfig, NULL);
if (kconfig) { if (kconfig) {
obj->kconfig = strdup(kconfig); obj->kconfig = strdup(kconfig);
if (!obj->kconfig) if (!obj->kconfig) {
return ERR_PTR(-ENOMEM); err = -ENOMEM;
goto out;
}
} }
err = bpf_object__elf_init(obj); err = bpf_object__elf_init(obj);