From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 11 Jul 2023 08:10:40 +0000 (+0200)
Subject: x86/cfi: Only define poison_cfi() if CONFIG_X86_KERNEL_IBT=y
X-Git-Tag: v6.5-rc2~13^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=535d0ae39185a266536a1e97ff9a8956d7fbb9df;p=thirdparty%2Fkernel%2Flinux.git

x86/cfi: Only define poison_cfi() if CONFIG_X86_KERNEL_IBT=y

poison_cfi() was introduced in:

  9831c6253ace ("x86/cfi: Extend ENDBR sealing to kCFI")

... but it's only ever used under CONFIG_X86_KERNEL_IBT=y,
and if that option is disabled, we get:

  arch/x86/kernel/alternative.c:1243:13: error: ‘poison_cfi’ defined but not used [-Werror=unused-function]

Guard the definition with CONFIG_X86_KERNEL_IBT.

Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index d77aaabf9fe8e..2dcf3a06af090 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1240,7 +1240,9 @@ static void __apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,
 {
 }
 
+#ifdef CONFIG_X86_KERNEL_IBT
 static void poison_cfi(void *addr) { }
+#endif
 
 #endif