]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
x86/xen: fix SLS mitigation in xen_hypercall_iret()
authorJuergen Gross <jgross@suse.com>
Fri, 17 Jan 2025 11:05:51 +0000 (12:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 1 Feb 2025 17:22:31 +0000 (18:22 +0100)
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>
arch/x86/xen/xen-asm.S

index 2055206b0f4154b6ca09aee05e9e35bca2280ddb..620c804990aafff2e6cb4e41144aa707f6fb0039 100644 (file)
@@ -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