From: Sami Tolvanen <samitolvanen@google.com>
Date: Thu, 8 Sep 2022 21:55:01 +0000 (-0700)
Subject: x86/tools/relocs: Ignore __kcfi_typeid_ relocations
X-Git-Tag: v6.6.17~6535^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca7e10bff196f69a450b9072a7b757713d3bb2dd;p=platform%2Fkernel%2Flinux-rpi.git

x86/tools/relocs: Ignore __kcfi_typeid_ relocations

The compiler generates __kcfi_typeid_ symbols for annotating assembly
functions with type information. These are constants that can be
referenced in assembly code and are resolved by the linker. Ignore
them in relocs.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220908215504.3686827-20-samitolvanen@google.com
---

diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index e2c5b29..2925074b 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -56,6 +56,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
 	"^(xen_irq_disable_direct_reloc$|"
 	"xen_save_fl_direct_reloc$|"
 	"VDSO|"
+	"__kcfi_typeid_|"
 	"__crc_)",
 
 /*