From 150b8cfaaf49d86f90187cbf071aa3fa55476ac1 Mon Sep 17 00:00:00 2001

From: Jiri Denemark <jdenemar@redhat.com>

Date: Tue, 9 Apr 2019 12:35:52 +0200

Subject: [PATCH 2/2] cpu_map: Define md-clear CPUID bit

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091

The bit is set when microcode provides the mechanism to invoke a flush

of various exploitable CPU buffers by invoking the VERW instruction.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

(cherry picked from commit 538d873571d7a682852dc1d70e5f4478f4d64e85)

---

 src/cpu_map/x86_features.xml                                | 3 +++

 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml  | 2 +-

 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    | 1 +

 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml     | 1 +

 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml     | 1 +

 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 1 +

 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml  | 1 +

 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml

index efcc10b1ae..370807f88e 100644

--- a/src/cpu_map/x86_features.xml

+++ b/src/cpu_map/x86_features.xml

@@ -320,6 +320,9 @@

   <feature name='avx512-4fmaps'>

     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>

   </feature>

+  <feature name='md-clear'> 

+    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>

+  </feature>

   <feature name='pconfig'>

     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>

   </feature>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml

index 0deca9fba6..74763a462b 100644

--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml

+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml

@@ -2,7 +2,7 @@

 <cpudata arch='x86'>

   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>

   <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>

-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>

+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000400'/>

   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>

   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>

 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml

index 70a0fc3286..867970d2c7 100644

--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml

+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml

@@ -20,6 +20,7 @@

   <feature policy='require' name='tsc_adjust'/>

   <feature policy='require' name='clflushopt'/>

   <feature policy='require' name='intel-pt'/>

+  <feature policy='require' name='md-clear'/>

   <feature policy='require' name='stibp'/>

   <feature policy='require' name='ssbd'/>

   <feature policy='require' name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml

index bbdfb6aa61..e7ced42797 100644

--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml

+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml

@@ -21,6 +21,7 @@

   <feature name='tsc_adjust'/>

   <feature name='clflushopt'/>

   <feature name='intel-pt'/>

+  <feature name='md-clear'/>

   <feature name='stibp'/>

   <feature name='ssbd'/>

   <feature name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml

index 1f321db273..a5591278df 100644

--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml

+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml

@@ -5,6 +5,7 @@

   <feature policy='require' name='hypervisor'/>

   <feature policy='require' name='tsc_adjust'/>

   <feature policy='require' name='clflushopt'/>

+  <feature policy='require' name='md-clear'/>

   <feature policy='require' name='stibp'/>

   <feature policy='require' name='ssbd'/>

   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml

index cc1fc90c45..c7e8a1fccf 100644

--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml

+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml

@@ -23,6 +23,7 @@

   <feature policy='require' name='intel-pt'/>

   <feature policy='require' name='pku'/>

   <feature policy='require' name='ospke'/>

+  <feature policy='require' name='md-clear'/>

   <feature policy='require' name='stibp'/>

   <feature policy='require' name='arch-capabilities'/>

   <feature policy='require' name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml

index dfabdc57c7..d7482751b4 100644

--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml

+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml

@@ -24,6 +24,7 @@

   <feature name='intel-pt'/>

   <feature name='pku'/>

   <feature name='ospke'/>

+  <feature name='md-clear'/>

   <feature name='stibp'/>

   <feature name='arch-capabilities'/>

   <feature name='xsaves'/>

-- 

2.21.0