summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2025-01-17 12:05:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-23 17:17:17 +0100
commit060de3717c4a9831035d04a00b5bb224d0c89667 (patch)
treefc7137cb4fd76958e1e924fb206e0ecc1bb0863f
parent400fb0e9c2a6c07b5f1b5145f061d7786df9c47f (diff)
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>
-rw-r--r--arch/x86/xen/xen-asm.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S
index aa2676a7e2a4..a9b878fd6ee0 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