5.15-stable patches

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

diff --git a/queue-5.15/series b/queue-5.15/series
index c3a892bcc4bcdf74f1915a72d22962f2cc506d61..f8342964f20e7c6256e5eddef986150c6bdec12c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -122,3 +122,4 @@ blk-cgroup-fix-uaf-in-blkcg_unpin_online.patch
 vsock-virtio-discard-packets-if-the-transport-changes.patch
 ipv6-avoid-possible-null-deref-in-rt6_uncached_list_flush_dev.patch
 nfsd-add-list_head-nf_gc-to-struct-nfsd_file.patch
+x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch

diff --git a/queue-5.15/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch b/queue-5.15/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch
new file mode 100644 (file)
index 0000000..c69a0c1
--- /dev/null
+++ b/queue-5.15/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch
@@ -0,0 +1,31 @@
+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(-)
+
+--- a/arch/x86/xen/xen-asm.S
++++ b/arch/x86/xen/xen-asm.S
+@@ -214,7 +214,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