26ba25
From 7085d8ac9d907fbfddb2c2c432f239939aa2aa2f Mon Sep 17 00:00:00 2001
26ba25
From: Eduardo Habkost <ehabkost@redhat.com>
26ba25
Date: Wed, 13 Jun 2018 18:08:12 +0200
26ba25
Subject: [PATCH 153/268] i386: define the AMD 'virt-ssbd' CPUID feature bit
26ba25
 (CVE-2018-3639)
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
26ba25
Message-id: <20180613180812.28169-3-ehabkost@redhat.com>
26ba25
Patchwork-id: 80676
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 2/2] i386: define the AMD 'virt-ssbd' CPUID feature bit (CVE-2018-3639)
26ba25
Bugzilla: 1574216
26ba25
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
26ba25
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
26ba25
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
26ba25
26ba25
AMD Zen expose the Intel equivalant to Speculative Store Bypass Disable
26ba25
via the 0x80000008_EBX[25] CPUID feature bit.
26ba25
26ba25
This needs to be exposed to guest OS to allow them to protect
26ba25
against CVE-2018-3639.
26ba25
26ba25
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
26ba25
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
26ba25
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
26ba25
Message-Id: <20180521215424.13520-3-berrange@redhat.com>
26ba25
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
26ba25
(cherry picked from commit 403503b162ffc33fb64cfefdf7b880acf41772cd)
26ba25
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 target/i386/cpu.c | 2 +-
26ba25
 1 file changed, 1 insertion(+), 1 deletion(-)
26ba25
26ba25
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
26ba25
index 8647109..caab4e2 100644
26ba25
--- a/target/i386/cpu.c
26ba25
+++ b/target/i386/cpu.c
26ba25
@@ -1033,7 +1033,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
26ba25
             "ibpb", NULL, NULL, NULL,
26ba25
             NULL, NULL, NULL, NULL,
26ba25
             NULL, NULL, NULL, NULL,
26ba25
-            NULL, NULL, NULL, NULL,
26ba25
+            NULL, "virt-ssbd", NULL, NULL,
26ba25
             NULL, NULL, NULL, NULL,
26ba25
         },
26ba25
         .cpuid_eax = 0x80000008,
26ba25
-- 
26ba25
1.8.3.1
26ba25