Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-05-21 16:10:38 +0200
committerMichal Kubecek <mkubecek@suse.cz>2018-05-21 16:10:38 +0200
commit90b9ed2521d16d1447527ed185efa800e28d8c99 (patch)
treee44bf755e518b45c42ab6b6d599432db3424a9a3
parent6e5bab5615e73f861674c15c085e26a7333886d4 (diff)
parent3a95cb3d35fbd4288b5416dfd32e432bc61d6540 (diff)
Merge branch 'users/jkosina/SLE12-SP3/ssb' into users/mkubecek/SLE12-SP3/1094019_EMBARGO
Pull additional Spectre v4 fix from Jiri Kosina.
-rw-r--r--patches.suse/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX-SLE12.patch24
-rw-r--r--series.conf2
2 files changed, 26 insertions, 0 deletions
diff --git a/patches.suse/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX-SLE12.patch b/patches.suse/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX-SLE12.patch
new file mode 100644
index 0000000000..1ee17c285f
--- /dev/null
+++ b/patches.suse/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX-SLE12.patch
@@ -0,0 +1,24 @@
+From: Jiri Kosina <jkosina@suse.cz>
+Subject: [PATCH] x86/bugs: make intel_rds_mask() honor X86_FEATURE_SSBD
+References: bsc#1094019
+
+Don't return SSBD mask from x86_calculate_kernel_spec_ctrl() if feature
+bit is not set.
+
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ arch/x86/kernel/cpu/bugs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@ -158,6 +158,9 @@ static inline u64 intel_rds_mask(void)
+ if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+ return 0;
+
++ if (!boot_cpu_has(X86_FEATURE_SSBD))
++ return 0;
++
+ mask = ssbd_tif_to_spec_ctrl(current_thread_info()->flags);
+
+ /*
diff --git a/series.conf b/series.conf
index 38ba521f9f..71c614ee0f 100644
--- a/series.conf
+++ b/series.conf
@@ -23029,6 +23029,8 @@
patches.suse/28-ssbd-remove-from-allwork-mask.patch
patches.suse/29-kvm-svm-move-spec-control-call-after-restore-of-gs.patch
+ patches.suse/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX-SLE12.patch
+
########################################################
# You'd better have a good reason for adding a patch
# below here.