From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Jim Mattson <jmattson@google.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>,
Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org,
Greg Thelen <gthelen@google.com>,
stable@vger.kernel.org
Subject: Re: [PATCH 5.10 RESEND] x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
Date: Tue, 9 Jul 2024 15:33:54 +0200 [thread overview]
Message-ID: <2024070930-monument-cola-a36e@gregkh> (raw)
In-Reply-To: <20240709132058.227930-1-jmattson@google.com>
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@google.com>
> Signed-off-by: Jim Mattson <jmattson@google.com>
> Acked-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(-)
Why is this a RESEND?
And is this only needed in this one stable branch or in any others?
thanks,
greg k-h
next prev parent reply other threads:[~2024-07-09 13:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 13:20 [PATCH 5.10 RESEND] x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk Jim Mattson
2024-07-09 13:33 ` Greg Kroah-Hartman [this message]
2024-07-09 13:55 ` Borislav Petkov
2024-07-09 14:12 ` [PATCH 6.1] " Borislav Petkov
2024-07-09 23:17 ` kernel test robot
2024-07-15 11:41 ` Greg Kroah-Hartman
2024-07-09 20:26 ` [PATCH 5.10 RESEND] " kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2024070930-monument-cola-a36e@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=bp@alien8.de \
--cc=gthelen@google.com \
--cc=jmattson@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.