Skip to contentSkip to conversation

cfi: Fix CFI failure with KASAN

PATCH New Sami Tolvanen 1 participant 1 message Dec 22, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cfi: Fix CFI failure with KASAN

When CFI_CLANG and KASAN are both enabled, LLVM doesn't generate a CFI type hash for asan.module_ctor functions in translation units where CFI is disabled, which leads to a CFI failure during boot when do_ctors calls the affected constructors:

CFI failure at do_basic_setup+0x64/0x90 (target:
asan.module_ctor+0x0/0x28; expected type: 0xa540670c)

Specifically, this happens because CFI is disabled for kernel/cfi.c. There's no reason to keep CFI disabled here anymore, so fix the failure by not filtering out CC_FLAGS_CFI for the file.

Note that https://reviews.llvm.org/rG3b14862f0a96 fixed the issue where LLVM didn't emit CFI type hashes for any sanitizer constructors, but now type hashes are emitted correctly for TUs that use CFI.

Fixes 89245600941e ("cfi: Switch to -fsanitize=kcfi")
---
 kernel/Makefile | 3 ---
 1 file changed, 3 deletions(-)
kernel/Makefile +0 -3
index e7fc37a68069..10ef068f598d 100644
@@ -41,9 +41,6 @@ UBSAN_SANITIZE_kcov.o := n
 KMSAN_SANITIZE_kcov.o := n
 CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack) -fno-stack-protector
 
-# Don't instrument error handlers
-CFLAGS_REMOVE_cfi.o := $(CC_FLAGS_CFI)
-
 obj-y += sched/
 obj-y += locking/
 obj-y += power/

base-commit: 8395ae05cb5a2e31d36106e8c85efa11cda849be

Signature · 1 line
2.39.0.314.g84b9a713c41-goog