Skip to content

Commit 42633ed

Browse files
samitolvanenkees
authored andcommitted
kbuild: Fix CFI hash randomization with KASAN
Clang emits a asan.module_ctor constructor to each object file when KASAN is enabled, and these functions are indirectly called in do_ctors. With CONFIG_CFI_CLANG, the compiler also emits a CFI type hash before each address-taken global function so they can pass indirect call checks. However, in commit 0c3e806 ("x86/cfi: Add boot time hash randomization"), x86 implemented boot time hash randomization, which relies on the .cfi_sites section generated by objtool. As objtool is run against vmlinux.o instead of individual object files with X86_KERNEL_IBT (enabled by default), CFI types in object files that are not part of vmlinux.o end up not being included in .cfi_sites, and thus won't get randomized and trip CFI when called. Only .vmlinux.export.o and init/version-timestamp.o are linked into vmlinux separately from vmlinux.o. As these files don't contain any functions, disable KASAN for both of them to avoid breaking hash randomization. Link: ClangBuiltLinux#1742 Fixes: 0c3e806 ("x86/cfi: Add boot time hash randomization") Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20230112224948.1479453-2-samitolvanen@google.com
1 parent 3b29348 commit 42633ed

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

init/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ include/generated/utsversion.h: FORCE
5959

6060
$(obj)/version-timestamp.o: include/generated/utsversion.h
6161
CFLAGS_version-timestamp.o := -include include/generated/utsversion.h
62+
KASAN_SANITIZE_version-timestamp.o := n

scripts/Makefile.vmlinux

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ quiet_cmd_cc_o_c = CC $@
1818
$(call if_changed_dep,cc_o_c)
1919

2020
ifdef CONFIG_MODULES
21+
KASAN_SANITIZE_.vmlinux.export.o := n
2122
targets += .vmlinux.export.o
2223
vmlinux: .vmlinux.export.o
2324
endif

0 commit comments

Comments
 (0)