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 4.14-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-4.14 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, 5 insertions(+), 1 deletion(-)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -998,8 +998,12 @@ static const __initconst struct x86_cpu_
#define MMIO_SBDS BIT(2)
/* CPU is affected by RETbleed, speculating where you would not expect it */
#define RETBLEED BIT(3)
+/* CPU is affected by SMT (cross-thread) return predictions */
+#define SMT_RSB BIT(4)
+/* CPU is affected by SRSO */
+#define SRSO BIT(5)
/* CPU is affected by GDS */
-#define GDS BIT(4)
+#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-4.14/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/arm-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/x86-speculation-add-kconfig-option-for-gds.patch
queue-4.14/um-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/documentation-x86-fix-backwards-on-off-logic-about-ymm-support.patch
queue-4.14/mips-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/init-x86-move-mem_encrypt_init-into-arch_cpu_finalize_init.patch
queue-4.14/sh-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/x86-fix-backwards-merge-of-gds-srso-bit.patch
queue-4.14/x86-speculation-add-gather-data-sampling-mitigation.patch
queue-4.14/init-invoke-arch_cpu_finalize_init-earlier.patch
queue-4.14/kvm-add-gds_no-support-to-kvm.patch
queue-4.14/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-4.14/x86-fpu-move-fpu-initialization-into-arch_cpu_finalize_init.patch
queue-4.14/x86-speculation-add-force-option-to-gds-mitigation.patch
queue-4.14/init-remove-check_bugs-leftovers.patch
queue-4.14/init-provide-arch_cpu_finalize_init.patch
queue-4.14/m68k-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/sparc-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/x86-fpu-mark-init-functions-__init.patch
queue-4.14/ia64-cpu-switch-to-arch_cpu_finalize_init.patch
queue-4.14/xen-netback-fix-buffer-overrun-triggered-by-unusual-packet.patch
queue-4.14/x86-fpu-remove-cpuinfo-argument-from-init-functions.patch
