On Tue, Jul 09, 2024 at 04:12:38PM +0200, Borislav Petkov wrote:
From: Jim Mattson jmattson@google.com Subject: [PATCH] x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
The linux-6.1-y backport of commit b377c66ae350 ("x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk") misplaced the new NOENDBR annotation, repeating the annotation on __x86_return_thunk, rather than adding the annotation to the !CONFIG_CPU_SRSO version of srso_alias_untrain_ret, as intended.
Move the annotation to the right place.
Fixes: 0bdc64e9e716 ("x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk") Reported-by: Greg Thelen gthelen@google.com Signed-off-by: Jim Mattson jmattson@google.com Acked-by: Borislav Petkov (AMD) bp@alien8.de Signed-off-by: Borislav Petkov (AMD) bp@alien8.de Cc: stable@vger.kernel.org
arch/x86/lib/retpoline.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Both now queued up, thanks.
greg k-h