From: Greg Kroah-Hartman Date: Tue, 21 Jan 2025 14:47:56 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.15.177~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93c8c240a199dc5d111dc9704d047537b90ca53d;p=thirdparty%2Fkernel%2Fstable-queue.git 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 bbf77b45b4..c0fcf64d2d 100644 --- 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 index 0000000000..b472ea49aa --- /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 +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(-) + +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 +