From: Ihor Solodrai <ihor.solodrai@linux.dev>
To: andrii@kernel.org, ast@kernel.org, daniel@iogearbox.net,
eddyz87@gmail.com
Cc: bpf@vger.kernel.org, mykolal@fb.com, kernel-team@meta.com
Subject: [PATCH] libbpf: check for empty BTF data section in btf_parse_elf
Date: Tue, 8 Apr 2025 11:41:04 -0700 [thread overview]
Message-ID: <20250408184104.3962949-1-ihor.solodrai@linux.dev> (raw)
A valid ELF file may contain a SHT_NOBITS .BTF section. This case is
not handled correctly in btf_parse_elf, which leads to a segfault.
Add a null check for a buffer returned by elf_getdata() before
proceeding with its processing.
Bug report: https://github.com/libbpf/libbpf/issues/894
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
tools/lib/bpf/btf.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 38bc6b14b066..90599f0311bd 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -1201,6 +1201,12 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
goto done;
}
+ if (!secs.btf_data->d_buf) {
+ pr_warn("BTF data is empty in %s\n", path);
+ err = -ENODATA;
+ goto done;
+ }
+
if (secs.btf_base_data) {
dist_base_btf = btf_new(secs.btf_base_data->d_buf, secs.btf_base_data->d_size,
NULL);
--
2.49.0
next reply other threads:[~2025-04-08 18:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 18:41 Ihor Solodrai [this message]
2025-04-09 12:09 ` [PATCH] libbpf: check for empty BTF data section in btf_parse_elf Mykyta Yatsenko
2025-04-09 15:44 ` Ihor Solodrai
2025-04-09 23:14 ` Andrii Nakryiko
2025-04-10 17:34 ` Ihor Solodrai
2025-04-10 17:39 ` Andrii Nakryiko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250408184104.3962949-1-ihor.solodrai@linux.dev \
--to=ihor.solodrai@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=kernel-team@meta.com \
--cc=mykolal@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox