From: Greg Kroah-Hartman Date: Tue, 21 Jan 2025 14:48:29 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v5.15.177~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=893e3c5de0b94e3362dbdc1405d6f891d2b1747c;p=thirdparty%2Fkernel%2Fstable-queue.git 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 c3a892bcc4..f8342964f2 100644 --- 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 index 0000000000..c69a0c1fa9 --- /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 +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 +Message-ID: <20250117110551.13930-1-jgross@suse.com> + +From: 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 from CONFIG_MITIGATION_SLS to CONFIG_SLS. + +Signed-off-by: Juergen Gross +Signed-off-by: Greg Kroah-Hartman +--- + 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