Skip to content
Commit 596dedc6 authored by Jim Mattson's avatar Jim Mattson Committed by Greg Kroah-Hartman
Browse files

x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk



The linux-5.10-y backport of commit b377c66a ("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: 0bdc64e9 ("x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk")
Reported-by: default avatarGreg Thelen <gthelen@google.com>
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Acked-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6d94236
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment