9ae3a8
From c95345b4fea239a4482652ad57b4106254cd79f0 Mon Sep 17 00:00:00 2001
9ae3a8
From: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
Date: Wed, 13 Jun 2018 18:50:56 +0200
9ae3a8
Subject: [PATCH 04/17] i386: define the AMD 'virt-ssbd' CPUID feature bit
9ae3a8
 (CVE-2018-3639)
9ae3a8
MIME-Version: 1.0
9ae3a8
Content-Type: text/plain; charset=UTF-8
9ae3a8
Content-Transfer-Encoding: 8bit
9ae3a8
9ae3a8
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
Message-id: <20180613185056.18066-3-ehabkost@redhat.com>
9ae3a8
Patchwork-id: 80680
9ae3a8
O-Subject: [RHEL-7.5 qemu-kvm PATCH 2/2] i386: define the AMD 'virt-ssbd' CPUID feature bit (CVE-2018-3639)
9ae3a8
Bugzilla: 1584583
9ae3a8
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
9ae3a8
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
9ae3a8
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
9ae3a8
9ae3a8
AMD Zen expose the Intel equivalant to Speculative Store Bypass Disable
9ae3a8
via the 0x80000008_EBX[25] CPUID feature bit.
9ae3a8
9ae3a8
This needs to be exposed to guest OS to allow them to protect
9ae3a8
against CVE-2018-3639.
9ae3a8
9ae3a8
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
9ae3a8
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
9ae3a8
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
9ae3a8
Message-Id: <20180521215424.13520-3-berrange@redhat.com>
9ae3a8
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
(cherry picked from commit 403503b162ffc33fb64cfefdf7b880acf41772cd)
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
9ae3a8
Conflicts:
9ae3a8
    target/i386/cpu.c is target-i386/cpu.c
9ae3a8
9ae3a8
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
---
9ae3a8
 target-i386/cpu.c | 2 +-
9ae3a8
 1 file changed, 1 insertion(+), 1 deletion(-)
9ae3a8
9ae3a8
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
9ae3a8
index 0254747..4b3a238 100644
9ae3a8
--- a/target-i386/cpu.c
9ae3a8
+++ b/target-i386/cpu.c
9ae3a8
@@ -183,7 +183,7 @@ static const char *cpuid_80000008_ebx_feature_name[] = {
9ae3a8
     "ibpb", NULL, NULL, NULL,
9ae3a8
     NULL, NULL, NULL, NULL,
9ae3a8
     NULL, NULL, NULL, NULL,
9ae3a8
-    NULL, NULL, NULL, NULL,
9ae3a8
+    NULL, "virt-ssbd", NULL, NULL,
9ae3a8
     NULL, NULL, NULL, NULL,
9ae3a8
 };
9ae3a8
 
9ae3a8
-- 
9ae3a8
1.8.3.1
9ae3a8