Skip to content

Commit 3c0f444

Browse files
nathanchanceyaowenrui
authored and
yaowenrui
committed
kbuild: Fix changing ELF file type for output of gen_btf for big endian
stable inclusion from stable-5.10.210 commit 5abf3e8af2e34dd8b21f6a35f9a7672eea0e3abc category: bugfix issue: #IAOD4C CVE: NA Signed-off-by: yaowenrui <yaowenrui2@huawei.com> --------------------------------------- commit e3a9ee963ad8ba677ca925149812c5932b49af69 upstream. Commit 90ceddc ("bpf: Support llvm-objcopy for vmlinux BTF") changed the ELF type of .btf.vmlinux.bin.o to ET_REL via dd, which works fine for little endian platforms: 00000000 7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00 |.ELF............| -00000010 03 00 b7 00 01 00 00 00 00 00 00 80 00 80 ff ff |................| +00000010 01 00 b7 00 01 00 00 00 00 00 00 80 00 80 ff ff |................| However, for big endian platforms, it changes the wrong byte, resulting in an invalid ELF file type, which ld.lld rejects: 00000000 7f 45 4c 46 02 02 01 00 00 00 00 00 00 00 00 00 |.ELF............| -00000010 00 03 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................| +00000010 01 03 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................| Type: <unknown>: 103 ld.lld: error: .btf.vmlinux.bin.o: unknown file type Fix this by updating the entire 16-bit e_type field rather than just a single byte, so that everything works correctly for all platforms and linkers. 00000000 7f 45 4c 46 02 02 01 00 00 00 00 00 00 00 00 00 |.ELF............| -00000010 00 03 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................| +00000010 00 01 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................| Type: REL (Relocatable file) While in the area, update the comment to mention that binutils 2.35+ matches LLD's behavior of rejecting an ET_EXEC input, which occurred after the comment was added. Cc: stable@vger.kernel.org Fixes: 90ceddc ("bpf: Support llvm-objcopy for vmlinux BTF") Link: llvm/llvm-project#75643 Suggested-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Fangrui Song <maskray@google.com> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Justin Stitt <justinstitt@google.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> [nathan: Fix silent conflict due to lack of 7d153696e5db in older trees] Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: yaowenrui <yaowenrui2@huawei.com>
1 parent d5c4128 commit 3c0f444

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

scripts/link-vmlinux.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,13 @@ gen_btf()
222222
${OBJCOPY} --only-section=.BTF --set-section-flags .BTF=alloc,readonly \
223223
--strip-all ${1} ${2} 2>/dev/null
224224
# Change e_type to ET_REL so that it can be used to link final vmlinux.
225-
# Unlike GNU ld, lld does not allow an ET_EXEC input.
226-
printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none
225+
# GNU ld 2.35+ and lld do not allow an ET_EXEC input.
226+
if [ -n "${CONFIG_CPU_BIG_ENDIAN}" ]; then
227+
et_rel='\0\1'
228+
else
229+
et_rel='\1\0'
230+
fi
231+
printf "${et_rel}" | dd of=${2} conv=notrunc bs=1 seek=16 status=none
227232
}
228233

229234
# Create ${2} .S file with all symbols from the ${1} object file

0 commit comments

Comments
 (0)