]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
libbpf: Fix the possible memory leak on error
authorShuyi Cheng <chengshuyi@linux.alibaba.com>
Tue, 13 Jul 2021 12:42:38 +0000 (20:42 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 08:00:37 +0000 (10:00 +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

index c41d9b2b59aceff4ca23767527d187eafbc3ce92..2af2d0e4a23165764e29fb4ef68275af818c9e63 100644 (file)
@@ -7365,8 +7365,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);