提交 917fac64 编写于 作者: S Shuyi Cheng 提交者: Zheng Zengkai

libbpf: Fix the possible memory leak on error

stable inclusion
from stable-5.10.65
commit 6ca0b4089166c6e03b95e48866931d23f4ff542f
bugzilla: 182361 https://gitee.com/openeuler/kernel/issues/I4EH3U

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6ca0b4089166c6e03b95e48866931d23f4ff542f

--------------------------------

[ Upstream commit 18353c87 ]

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

Fixes: 166750bc ("libbpf: Support libbpf-provided extern variables")
Signed-off-by: NShuyi Cheng <chengshuyi@linux.alibaba.com>
Signed-off-by: NAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1626180159-112996-3-git-send-email-chengshuyi@linux.alibaba.comSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 38e9d289
...@@ -6907,8 +6907,10 @@ __bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz, ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册