yeahuh / rpms / qemu-kvm

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