[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240405144637.17908-1-bp@kernel.org>
Date: Fri, 5 Apr 2024 16:46:37 +0200
From: bp@...nel.org
To: X86 ML <x86@...nel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
"Borislav Petkov (AMD)" <bp@...en8.de>
Subject: [PATCH] x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
From: "Borislav Petkov (AMD)" <bp@...en8.de>
It 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:
vmlinux.o: warning: objtool: .export_symbol+0x2b290: data relocation to !ENDBR: srso_alias_untrain_ret+0x0
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
---
arch/x86/lib/retpoline.S | 1 +
1 file changed, 1 insertion(+)
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)
--
2.43.0
Powered by blists - more mailing lists