5.4-stable patches

added patches:
	x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index bbf77b45b4f924322c738ffa7d8bf5a8a99e71f7..c0fcf64d2dda029ad163d2fb8605fa494b568ca6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -70,3 +70,4 @@ fs-proc-fix-softlockup-in-__read_vmcore-part-2.patch
 irqchip-gic-v3-handle-cpu_pm_enter_failed-correctly.patch
 hrtimers-handle-cpu-state-correctly-on-hotplug.patch
 ipv6-avoid-possible-null-deref-in-rt6_uncached_list_flush_dev.patch
+x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch

diff --git a/queue-5.4/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch b/queue-5.4/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch
new file mode 100644 (file)
index 0000000..b472ea4
--- /dev/null
+++ b/queue-5.4/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch
@@ -0,0 +1,36 @@
+From jgross@suse.com  Tue Jan 21 15:16:05 2025
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 17 Jan 2025 12:05:51 +0100
+Subject: x86/xen: fix SLS mitigation in xen_hypercall_iret()
+To: gregkh@linuxfoundation.org
+Cc: stable@vger.kernel.org, Juergen Gross <jgross@suse.com>
+Message-ID: <20250117110551.13930-1-jgross@suse.com>
+
+From: Juergen Gross <jgross@suse.com>
+
+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 | 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
+