diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2024-04-05 16:46:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-10 16:28:32 +0200 |
| commit | 7ef6a7f9b32fdfc8bec0a10e6d5ac5374d4f02e7 (patch) | |
| tree | e0747ba5027fbdcb0e329871b9c87c17572a6614 | |
| parent | c19715ec258d4be92e0995660d31ae2612439f0b (diff) | |
| download | linux-7ef6a7f9b32fdfc8bec0a10e6d5ac5374d4f02e7.tar.gz linux-7ef6a7f9b32fdfc8bec0a10e6d5ac5374d4f02e7.tar.bz2 linux-7ef6a7f9b32fdfc8bec0a10e6d5ac5374d4f02e7.zip | |
x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
commit b377c66ae3509ccea596512d6afb4777711c4870 upstream.
srso_alias_untrain_ret() is special code, even if it is a dummy
which is called in the !SRSO case, so annotate it like its real
counterpart, to address the following objtool splat:
vmlinux.o: warning: objtool: .export_symbol+0x2b290: data relocation to !ENDBR: srso_alias_untrain_ret+0x0
Fixes: 4535e1a4174c ("x86/bugs: Fix the SRSO mitigation on Zen3/4")
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20240405144637.17908-1-bp@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/lib/retpoline.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index a96e816e5ccd..055955c9bfcb 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -261,6 +261,7 @@ SYM_CODE_START(__x86_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_CODE_END(__x86_return_thunk) |