From: Pu Lehui <pulehui@huawei.com>
Date: Wed, 15 Jan 2025 10:02:39 +0000 (+0000)
Subject: libbpf: Fix return zero when elf_begin failed
X-Git-Tag: v6.14-rc1~133^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5436a54332c19df0acbef2b87cbf9f7cba56f2dd;p=thirdparty%2Flinux.git

libbpf: Fix return zero when elf_begin failed

The error number of elf_begin is omitted when encapsulating the
btf_find_elf_sections function.

Fixes: c86f180ffc99 ("libbpf: Make btf_parse_elf process .BTF.base transparently")
Signed-off-by: Pu Lehui <pulehui@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20250115100241.4171581-2-pulehui@huaweicloud.com
---

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index a4ae2df68b914..48c66f3a92002 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -1186,6 +1186,7 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
 
 	elf = elf_begin(fd, ELF_C_READ, NULL);
 	if (!elf) {
+		err = -LIBBPF_ERRNO__FORMAT;
 		pr_warn("failed to open %s as ELF file\n", path);
 		goto done;
 	}