From: Dominique Martinet <asmadeus@codewreck.org>
To: stable@vger.kernel.org, Alan Maguire <alan.maguire@oracle.com>,
andrii@kernel.org, eddyz87@gmail.com
Cc: ast@kernel.org, ihor.solodrai@linux.dev, daniel@iogearbox.net,
memxor@gmail.com, martin.lau@linux.dev, song@kernel.org,
yonghong.song@linux.dev, jolsa@kernel.org, emil@etsalapatis.com,
dwarves@vger.kernel.org, bpf@vger.kernel.org,
Dominique Martinet <asmadeus@codewreck.org>,
Alan Maguire <almagui@kernel.org>
Subject: [PATCH 5.10-6.18 v2] libbpf: fix cross-endian build with newer libbpf
Date: Tue, 17 Nov 2026 08:33:01 +0900 [thread overview]
Message-ID: <20261116233301.1531563-1-asmadeus@codewreck.org> (raw)
commit 087f3964f4b3 ("libbpf: Support layout section handling in BTF")
added extra data to the BTF header.
This extra data is ignored in the native case, but when building with
different endianness the bswap code in old libbpf would check for strict
size equality, leading to build failures such as this when BTF data is
generated with a newer version of libbpf (through pahole)
BTFIDS vmlinux.unstripped
libbpf: Can't load BTF with non-native endianness due to unsupported header length 32
FAILED: load BTF from vmlinux.unstripped: Operation not supported
make[2]: *** [../scripts/Makefile.vmlinux:72: vmlinux.unstripped] Error 255
Newer libbpf versions also properly ignore trailing data in the bswap
case, but the patch is too intrusive to backport, so take the header
length comparison fix from it instead.
Link: https://github.com/NixOS/nixpkgs/pull/570639
Fixes: 3289959b97ca ("libbpf: Support BTF loading and raw data output in both endianness")
Acked-by: Alan Maguire <almagui@kernel.org>
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
---
v1 -> v2:
- link to v1: https://lore.kernel.org/r/20261115200505.1494710-2-asmadeus@codewreck.org
- use offsetofend() instead of sizeof() to match the support layout
section handling patch as suggested by Alan
I checked this builds on 5.10 (non-cross-endian build) and 6.18 (ppc64
cross build)
- add Fixes tag as suggested by sashiko
tools/lib/bpf/btf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 9f141395c074..0ab11be8ebc5 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -229,14 +229,14 @@ static int btf_parse_hdr(struct btf *btf)
struct btf_header *hdr = btf->hdr;
__u32 meta_left;
- if (btf->raw_size < sizeof(struct btf_header)) {
+ if (btf->raw_size < offsetofend(struct btf_header, str_len)) {
pr_debug("BTF header not found\n");
return -EINVAL;
}
if (hdr->magic == bswap_16(BTF_MAGIC)) {
btf->swapped_endian = true;
- if (bswap_32(hdr->hdr_len) != sizeof(struct btf_header)) {
+ if (bswap_32(hdr->hdr_len) < offsetofend(struct btf_header, str_len)) {
pr_warn("Can't load BTF with non-native endianness due to unsupported header length %u\n",
bswap_32(hdr->hdr_len));
return -ENOTSUP;
--
2.56.1
reply other threads:[~2026-11-16 23:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261116233301.1531563-1-asmadeus@codewreck.org \
--to=asmadeus@codewreck.org \
--cc=alan.maguire@oracle.com \
--cc=almagui@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dwarves@vger.kernel.org \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=ihor.solodrai@linux.dev \
--cc=jolsa@kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=song@kernel.org \
--cc=stable@vger.kernel.org \
--cc=yonghong.song@linux.dev \
/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