From: Greg Kroah-Hartman Date: Sat, 18 Apr 2026 08:01:52 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.10.253~6 X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=ebed5bfed06740f9fe12413e1764f2f97b6907de;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: x86-cpu-fix-fpdss-on-zen1.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index 20dc7316a5..3c3daa6e7a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -53,3 +53,4 @@ net-stmmac-fix-integer-underflow-in-chain-mode.patch rxrpc-fix-reference-count-leak-in-rxrpc_server_keyring.patch rxrpc-fix-key-keyring-checks-in-setsockopt-rxrpc_security_key-keyring.patch revert-pci-enable-acs-after-configuring-iommu-for-of-platforms.patch +x86-cpu-fix-fpdss-on-zen1.patch diff --git a/queue-6.1/x86-cpu-fix-fpdss-on-zen1.patch b/queue-6.1/x86-cpu-fix-fpdss-on-zen1.patch new file mode 100644 index 0000000000..dea7d545e9 --- /dev/null +++ b/queue-6.1/x86-cpu-fix-fpdss-on-zen1.patch @@ -0,0 +1,47 @@ +From e55d98e7756135f32150b9b8f75d580d0d4b2dd3 Mon Sep 17 00:00:00 2001 +From: "Borislav Petkov (AMD)" +Date: Tue, 7 Apr 2026 11:40:03 +0200 +Subject: x86/CPU: Fix FPDSS on Zen1 + +From: Borislav Petkov (AMD) + +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) +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -580,6 +580,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 +@@ -1051,6 +1051,9 @@ static void init_amd_zn(struct cpuinfo_x + if (c->x86 == 0x19 && !cpu_has(c, X86_FEATURE_BTC_NO)) + set_cpu_cap(c, X86_FEATURE_BTC_NO); + } ++ ++ 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 bool cpu_has_zenbleed_microcode(void)