[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2024070930-monument-cola-a36e@gregkh>
Date: Tue, 9 Jul 2024 15:33:54 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Jim Mattson <jmattson@...gle.com>
Cc: "Borislav Petkov (AMD)" <bp@...en8.de>, Ingo Molnar <mingo@...nel.org>,
x86@...nel.org, linux-kernel@...r.kernel.org,
Greg Thelen <gthelen@...gle.com>, stable@...r.kernel.org
Subject: Re: [PATCH 5.10 RESEND] x86/retpoline: Move a NOENDBR annotation to
the SRSO dummy return thunk
On Tue, Jul 09, 2024 at 06:20:46AM -0700, Jim Mattson wrote:
> The linux-5.10-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@...gle.com>
> Signed-off-by: Jim Mattson <jmattson@...gle.com>
> Acked-by: Borislav Petkov (AMD) <bp@...en8.de>
> Cc: stable@...r.kernel.org
> ---
> arch/x86/lib/retpoline.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Why is this a RESEND?
And is this only needed in this one stable branch or in any others?
thanks,
greg k-h
Powered by blists - more mailing lists