From: Greg Kroah-Hartman Date: Tue, 21 Jan 2025 14:48:38 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v5.15.177~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a37b8cb853e6a8cdc10bf9a519088ad1ddfdd09;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index 73c427951e..7b573a11a6 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -60,3 +60,4 @@ wifi-ath10k-avoid-null-pointer-error-during-sdio-remove.patch erofs-tidy-up-erofs-on-disk-naming.patch erofs-handle-nonhead-delta-lclusters-gracefully.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.1/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch b/queue-6.1/x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch new file mode 100644 index 0000000000..b44ce7facd --- /dev/null +++ b/queue-6.1/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 +@@ -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