projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f1673e8
)
libbpf: Fix the possible memory leak on error
author
Shuyi Cheng
<chengshuyi@linux.alibaba.com>
Tue, 13 Jul 2021 12:42:38 +0000
(20:42 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 07:50:32 +0000
(09:50 +0200)
[ Upstream commit
18353c87e0e0440d4c7c746ed740738bbc1b538e
]
If the strdup() fails then we need to call bpf_object__close(obj) to
avoid a resource leak.
Fixes:
166750bc1dd2
("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>
tools/lib/bpf/libbpf.c
patch
|
blob
|
history
diff --git
a/tools/lib/bpf/libbpf.c
b/tools/lib/bpf/libbpf.c
index
95eef7e
..
04cde73
100644
(file)
--- a/
tools/lib/bpf/libbpf.c
+++ b/
tools/lib/bpf/libbpf.c
@@
-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);
if (kconfig) {
obj->kconfig = strdup(kconfig);
- if (!obj->kconfig)
- return ERR_PTR(-ENOMEM);
+ if (!obj->kconfig) {
+ err = -ENOMEM;
+ goto out;
+ }
}
err = bpf_object__elf_init(obj);