6.6-stable patches

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

diff --git a/queue-6.6/series b/queue-6.6/series
index b5d32ac3e48f2e2fe87b5af7328eba40682db256..4fecb815d273302eff942507a7dfbc8d33415b9a 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -68,3 +68,4 @@ ovl-support-encoding-fid-from-inode-with-no-alias.patch
 fs-relax-assertions-on-failure-to-encode-file-handles.patch
 revert-drm-amdgpu-rework-resume-handling-for-display-v2.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-6.6/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch b/queue-6.6/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch
new file mode 100644 (file)
index 0000000..b44ce7f
--- /dev/null
+++ b/queue-6.6/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
+@@ -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