x86/xen: fix SLS mitigation in xen_hypercall_iret()
Subsystems (3)
Juergen Gross
maintainerPATCH 1/1 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 <[email protected]>
---
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(-)
arch/x86/xen/xen-asm.S +1 -1
@@ -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
Signature · 1 line
2.43.0
Greg KH
maintainerQuoted 32 lines · Juergen Gross
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 fromCONFIG_MITIGATION_SLStoCONFIG_SLS.Signed-off-by Juergen Gross <[email protected]>---
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(-)arch/x86/xen/xen-asm.S +1
-1@@ -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 .endmSignature · 1 line
2.43.0
Now queued up, thanks!
greg k-h