From: Greg Kroah-Hartman Date: Sat, 18 Apr 2026 08:04:18 +0000 (+0200) Subject: 6.12-stable patches X-Git-Tag: v5.10.253~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211ec47fff54e7b85ffc178080fde34aae124a5b;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: x86-cpu-fix-fpdss-on-zen1.patch --- diff --git a/queue-6.12/series b/queue-6.12/series index d9e3a961e3..ac7a64a07b 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -67,3 +67,4 @@ rxrpc-fix-key-keyring-checks-in-setsockopt-rxrpc_security_key-keyring.patch rxrpc-fix-missing-error-checks-for-rxkad-encryption-decryption-failure.patch net-skb-fix-cross-cache-free-of-kfence-allocated-skb-head.patch alsa-hda-hdmi-add-quirk-for-tuxedo-ibs14g6.patch +x86-cpu-fix-fpdss-on-zen1.patch diff --git a/queue-6.12/x86-cpu-fix-fpdss-on-zen1.patch b/queue-6.12/x86-cpu-fix-fpdss-on-zen1.patch new file mode 100644 index 0000000000..55a5210cc6 --- /dev/null +++ b/queue-6.12/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 +@@ -628,6 +628,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 +@@ -935,6 +935,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 bool cpu_has_zenbleed_microcode(void)