6.18-stable patches

added patches:
	x86-cpu-fix-fpdss-on-zen1.patch

diff --git a/queue-6.18/series b/queue-6.18/series
index ba7b563f69d19f1639d47f8c4e6a5ca7fd540f33..d4159939c5a198f7ee316f6ed045f2b79b7674a1 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -81,3 +81,4 @@ rxrpc-fix-buffer-overread-in-rxgk_do_verify_authenticator.patch
 rxrpc-only-handle-response-during-service-challenge.patch
 rxrpc-proc-size-address-buffers-for-pispc-output.patch
 net-skb-fix-cross-cache-free-of-kfence-allocated-skb-head.patch
+x86-cpu-fix-fpdss-on-zen1.patch

diff --git a/queue-6.18/x86-cpu-fix-fpdss-on-zen1.patch b/queue-6.18/x86-cpu-fix-fpdss-on-zen1.patch
new file mode 100644 (file)
index 0000000..7650e1e
--- /dev/null
+++ b/queue-6.18/x86-cpu-fix-fpdss-on-zen1.patch
@@ -0,0 +1,47 @@
+From e55d98e7756135f32150b9b8f75d580d0d4b2dd3 Mon Sep 17 00:00:00 2001
+From: "Borislav Petkov (AMD)" <bp@alien8.de>
+Date: Tue, 7 Apr 2026 11:40:03 +0200
+Subject: x86/CPU: Fix FPDSS on Zen1
+
+From: Borislav Petkov (AMD) <bp@alien8.de>
+
+commit e55d98e7756135f32150b9b8f75d580d0d4b2dd3 upstream.
+
+Zen1's hardware divider can leave, under certain circumstances, partial
+results from previous operations.  Those results can be leaked by
+another, attacker thread.
+
+Fix that with a chicken bit.
+
+Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/include/asm/msr-index.h |    3 +++
+ arch/x86/kernel/cpu/amd.c        |    3 +++
+ 2 files changed, 6 insertions(+)
+
+--- a/arch/x86/include/asm/msr-index.h
++++ b/arch/x86/include/asm/msr-index.h
+@@ -645,6 +645,9 @@
+ #define MSR_AMD64_DC_CFG              0xc0011022
+ #define MSR_AMD64_TW_CFG              0xc0011023
+ 
++#define MSR_AMD64_FP_CFG              0xc0011028
++#define MSR_AMD64_FP_CFG_ZEN1_DENORM_FIX_BIT  9
++
+ #define MSR_AMD64_DE_CFG              0xc0011029
+ #define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT  1
+ #define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE     BIT_ULL(MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT)
+--- a/arch/x86/kernel/cpu/amd.c
++++ b/arch/x86/kernel/cpu/amd.c
+@@ -949,6 +949,9 @@ static void init_amd_zen1(struct cpuinfo
+               msr_clear_bit(MSR_K7_HWCR, MSR_K7_HWCR_IRPERF_EN_BIT);
+               clear_cpu_cap(c, X86_FEATURE_IRPERF);
+       }
++
++      pr_notice_once("AMD Zen1 FPDSS bug detected, enabling mitigation.\n");
++      msr_set_bit(MSR_AMD64_FP_CFG, MSR_AMD64_FP_CFG_ZEN1_DENORM_FIX_BIT);
+ }
+ 
+ static const struct x86_cpu_id amd_zenbleed_microcode[] = {