diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-07-11 10:10:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-07-11 10:17:55 +0200 |
| commit | 535d0ae39185a266536a1e97ff9a8956d7fbb9df (patch) | |
| tree | 4e06059c2d01ee55aad6cd1eb78d5395aaf90c66 | |
| parent | 04505bbbbb15da950ea0239e328a76a3ad2376e0 (diff) | |
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>
| -rw-r--r-- | arch/x86/kernel/alternative.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index d77aaabf9fe8..2dcf3a06af09 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 |