This is a note to let you know that I've just added the patch titled
x86: fix backwards merge of GDS/SRSO bit
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-fix-backwards-merge-of-gds-srso-bit.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Tue Aug 8 07:20:48 PM CEST 2023
Date: Tue, 08 Aug 2023 19:20:48 +0200
To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Subject: x86: fix backwards merge of GDS/SRSO bit
Stable-tree-only change.
Due to the way the GDS and SRSO patches flowed into the stable tree, it
was a 50% chance that the merge of the which value GDS and SRSO should
be. Of course, I lost that bet, and chose the opposite of what Linus
chose in commit 64094e7e3118 ("Merge tag 'gds-for-linus-2023-08-01' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
Fix this up by switching the values to match what is now in Linus's tree
as that is the correct value to mirror.
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1267,10 +1267,10 @@ static const __initconst struct x86_cpu_
#define RETBLEED BIT(3)
/* CPU is affected by SMT (cross-thread) return predictions */
#define SMT_RSB BIT(4)
-/* CPU is affected by GDS */
-#define GDS BIT(5)
/* CPU is affected by SRSO */
-#define SRSO BIT(6)
+#define SRSO BIT(5)
+/* CPU is affected by GDS */
+#define GDS BIT(6)
static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
VULNBL_INTEL_STEPPINGS(IVYBRIDGE, X86_STEPPING_ANY, SRBDS),
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-6.4/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/arm-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/x86-srso-add-ibpb_brtype-support.patch
queue-6.4/x86-srso-tie-sbpb-bit-setting-to-microcode-patch-detection.patch
queue-6.4/x86-speculation-add-kconfig-option-for-gds.patch
queue-6.4/um-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/documentation-x86-fix-backwards-on-off-logic-about-ymm-support.patch
queue-6.4/mips-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/x86-mem_encrypt-unbreak-the-amd_mem_encrypt-n-build.patch
queue-6.4/x86-bugs-increase-the-x86-bugs-vector-size-to-two-u32s.patch
queue-6.4/init-x86-move-mem_encrypt_init-into-arch_cpu_finalize_init.patch
queue-6.4/x86-srso-add-a-forgotten-noendbr-annotation.patch
queue-6.4/sh-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/x86-fix-backwards-merge-of-gds-srso-bit.patch
queue-6.4/x86-speculation-add-gather-data-sampling-mitigation.patch
queue-6.4/x86-srso-add-ibpb-on-vmexit.patch
queue-6.4/init-invoke-arch_cpu_finalize_init-earlier.patch
queue-6.4/kvm-add-gds_no-support-to-kvm.patch
queue-6.4/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-6.4/x86-fpu-move-fpu-initialization-into-arch_cpu_finalize_init.patch
queue-6.4/loongarch-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/x86-speculation-add-force-option-to-gds-mitigation.patch
queue-6.4/init-remove-check_bugs-leftovers.patch
queue-6.4/x86-srso-add-ibpb.patch
queue-6.4/x86-srso-fix-return-thunks-in-generated-code.patch
queue-6.4/init-provide-arch_cpu_finalize_init.patch
queue-6.4/m68k-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/x86-srso-add-a-speculative-ras-overflow-mitigation.patch
queue-6.4/x86-init-initialize-signal-frame-size-late.patch
queue-6.4/sparc-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/x86-fpu-mark-init-functions-__init.patch
queue-6.4/ia64-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.4/xen-netback-fix-buffer-overrun-triggered-by-unusual-packet.patch
queue-6.4/x86-srso-add-srso_no-support.patch
queue-6.4/x86-fpu-remove-cpuinfo-argument-from-init-functions.patch
