From: Greg KH <gregkh@linuxfoundation.org>
To: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Subject: Re: [PATCH] x86/xen: fix SLS mitigation in xen_hypercall_iret()
Date: Tue, 21 Jan 2025 15:16:53 +0100 [thread overview]
Message-ID: <2025012147-glamour-hence-9653@gregkh> (raw)
In-Reply-To: <20250117110551.13930-1-jgross@suse.com>
On Fri, Jan 17, 2025 at 12:05:51PM +0100, Juergen Gross wrote:
> The backport of upstream patch a2796dff62d6 ("x86/xen: don't do PV iret
> hypercall through hypercall page") missed to adapt the SLS mitigation
> config check from CONFIG_MITIGATION_SLS to CONFIG_SLS.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> This patch is meant to be applied to the following stable kernels:
> - linux-6.6
> - linux-6.1
> - linux-5.15
> - linux-5.10
> ---
> arch/x86/xen/xen-asm.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S
> index 901b60516683..6231f6efb4ee 100644
> --- a/arch/x86/xen/xen-asm.S
> +++ b/arch/x86/xen/xen-asm.S
> @@ -221,7 +221,7 @@ SYM_CODE_END(xen_early_idt_handler_array)
> push %rax
> mov $__HYPERVISOR_iret, %eax
> syscall /* Do the IRET. */
> -#ifdef CONFIG_MITIGATION_SLS
> +#ifdef CONFIG_SLS
> int3
> #endif
> .endm
> --
> 2.43.0
>
>
Now queued up, thanks!
greg k-h
prev parent reply other threads:[~2025-01-21 14:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-17 11:05 [PATCH] x86/xen: fix SLS mitigation in xen_hypercall_iret() Juergen Gross
2025-01-21 14:16 ` Greg KH [this message]
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=2025012147-glamour-hence-9653@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=jgross@suse.com \
--cc=stable@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox