From: Borislav Petkov (AMD) Date: Fri, 5 Apr 2024 14:46:37 +0000 (+0200) Subject: x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk X-Git-Tag: v6.6.26~62 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63bd08629aeeeefa5ee728d08be327e756051c72;p=thirdparty%2Fkernel%2Fstable.git 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) Signed-off-by: Ingo Molnar Cc: Linus Torvalds Link: https://lore.kernel.org/r/20240405144637.17908-1-bp@kernel.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 063aec2deadbb..ffa51f392e17a 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -223,6 +223,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)