File 0281-i386-define-the-ssbd-CPUID-feature-.patch of Package qemu.20361

Overview Repositories Revisions Requests Users Attributes Meta

File 0281-i386-define-the-ssbd-CPUID-feature-.patch of Package qemu.20361

From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Mon, 21 May 2018 22:54:22 +0100
Subject: i386: define the 'ssbd' CPUID feature bit (CVE-2018-3639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New microcode introduces the "Speculative Store Bypass Disable"
CPUID feature bit. This needs to be exposed to guest OS to allow
them to protect against CVE-2018-3639.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Message-Id: <20180521215424.13520-2-berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
(cherry picked from commit d19d1f965904a533998739698020ff4ee8a103da)
[BR: BSC#1092885 CVE-2018-3639]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 target-i386/cpu.c | 2 +-
 target-i386/cpu.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index b840868c3ec20ab741d3846d3685..461fd482077d2b775380bbabb9ae 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -289,7 +289,7 @@ static const char *cpuid_7_0_edx_feature_name[] = {
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,
     NULL, NULL, "spec-ctrl", NULL,
-    NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, "ssbd",
 };
 
 static const char *cpuid_apm_edx_feature_name[] = {
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index d19a7f176092a7feda7700424a39..88e1fdc2cf9eb844de977541a175 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -611,6 +611,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
 #define CPUID_7_0_ECX_PKU      (1U << 3)
 #define CPUID_7_0_ECX_OSPKE    (1U << 4)
 #define CPUID_7_0_EDX_SPEC_CTRL     (1U << 26) /* Speculation Control */
+#define CPUID_7_0_EDX_SPEC_CTRL_SSBD  (1U << 31) /* Speculative Store Bypass Disable */
 
 #define CPUID_8000_0008_EBX_IBPB    (1U << 12) /* Indirect Branch Prediction Barrier */

Places

File 0281-i386-define-the-ssbd-CPUID-feature-.patch of Package qemu.20361

Places