From: Tony Ambardar <tony.ambardar@gmail.com>
To: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>
Cc: Tony Ambardar <Tony.Ambardar@gmail.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org,
stable@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Yonghong Song <yhs@fb.com>
Subject: [PATCH bpf v1] bpf: fix libelf endian handling in resolv_btfids
Date: Wed, 16 Jun 2021 02:25:21 -0700 [thread overview]
Message-ID: <20210616092521.800788-1-Tony.Ambardar@gmail.com> (raw)
While patching the .BTF_ids section in vmlinux, resolve_btfids writes type
ids using host-native endianness, and relies on libelf for any required
translation when finally updating vmlinux. However, the default type of the
.BTF_ids section content is ELF_T_BYTE (i.e. unsigned char), and undergoes
no translation. This results in incorrect patched values if cross-compiling
to non-native endianness, and can manifest as kernel Oops and test failures
which are difficult to debug.
Explicitly set the type of patched data to ELF_T_WORD, allowing libelf to
transparently handle the endian conversions.
Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")
Cc: stable@vger.kernel.org # v5.10+
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/CAPGftE_eY-Zdi3wBcgDfkz_iOr1KF10n=9mJHm1_a_PykcsoeA@mail.gmail.com/
Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
---
tools/bpf/resolve_btfids/main.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
index d636643ddd35..f32c059fbfb4 100644
--- a/tools/bpf/resolve_btfids/main.c
+++ b/tools/bpf/resolve_btfids/main.c
@@ -649,6 +649,9 @@ static int symbols_patch(struct object *obj)
if (sets_patch(obj))
return -1;
+ /* Set type to ensure endian translation occurs. */
+ obj->efile.idlist->d_type = ELF_T_WORD;
+
elf_flagdata(obj->efile.idlist, ELF_C_SET, ELF_F_DIRTY);
err = elf_update(obj->efile.elf, ELF_C_WRITE);
--
2.25.1
next reply other threads:[~2021-06-16 9:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 9:25 Tony Ambardar [this message]
2021-06-16 15:56 ` [PATCH bpf v1] bpf: fix libelf endian handling in resolv_btfids Yonghong Song
2021-06-16 16:38 ` Jiri Olsa
2021-06-16 22:09 ` Tony Ambardar
2021-06-17 9:10 ` Jiri Olsa
2021-06-17 10:44 ` Mark Wielaard
2021-06-16 22:28 ` Mark Wielaard
2021-06-17 9:02 ` Jiri Olsa
2021-06-17 11:22 ` Daniel Borkmann
2021-06-18 0:20 ` Tony Ambardar
2021-06-18 6:14 ` [PATCH bpf v2] " Tony Ambardar
2021-06-18 15:10 ` patchwork-bot+netdevbpf
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=20210616092521.800788-1-Tony.Ambardar@gmail.com \
--to=tony.ambardar@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=yhs@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;
as well as URLs for NNTP newsgroup(s).