From: Juergen Gross <jgross@suse.com>
Date: Fri, 17 Jan 2025 11:05:51 +0000 (+0100)
Subject: x86/xen: fix SLS mitigation in xen_hypercall_iret()
X-Git-Tag: v5.10.234~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ffaf1a16f65fafe2959f3817088d4f6bb162b3b;p=thirdparty%2Fkernel%2Fstable.git

x86/xen: fix SLS mitigation in xen_hypercall_iret()

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S
index 2055206b0f415..620c804990aaf 100644
--- a/arch/x86/xen/xen-asm.S
+++ b/arch/x86/xen/xen-asm.S
@@ -242,7 +242,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