diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2024-04-05 16:46:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:01:50 +0200 |
| commit | b377c66ae3509ccea596512d6afb4777711c4870 (patch) | |
| tree | 12ec7759faeb1385516a11844ed13abfb93ee426 /arch | |
| parent | 5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9 (diff) | |
| download | lwn-b377c66ae3509ccea596512d6afb4777711c4870.tar.gz lwn-b377c66ae3509ccea596512d6afb4777711c4870.zip | |
x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
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
Diffstat (limited to 'arch')
| -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 0795b3464058..e674ccf720b9 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -229,6 +229,7 @@ SYM_CODE_END(srso_return_thunk) /* Dummy for the alternative in CALL_UNTRAIN_RET. */ SYM_CODE_START(srso_alias_untrain_ret) ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_FUNC_END(srso_alias_untrain_ret) |