71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From aa2a95a84f2cbd92b10887f3c99c7858fae9e7e4 Mon Sep 17 00:00:00 2001
|
|
From: Tom Lendacky <thomas.lendacky@amd.com>
|
|
Date: Mon, 17 Jul 2017 16:10:29 -0500
|
|
Subject: [PATCH 021/232] xen/x86: Remove SME feature in PV guests
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2017-5754
|
|
|
|
Xen does not currently support SME for PV guests. Clear the SME CPU
|
|
capability in order to avoid any ambiguity.
|
|
|
|
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
|
|
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Reviewed-by: Borislav Petkov <bp@suse.de>
|
|
Reviewed-by: Juergen Gross <jgross@suse.com>
|
|
Cc: <xen-devel@lists.xen.org>
|
|
Cc: Alexander Potapenko <glider@google.com>
|
|
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
|
|
Cc: Andy Lutomirski <luto@kernel.org>
|
|
Cc: Arnd Bergmann <arnd@arndb.de>
|
|
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
|
Cc: Borislav Petkov <bp@alien8.de>
|
|
Cc: Brijesh Singh <brijesh.singh@amd.com>
|
|
Cc: Dave Young <dyoung@redhat.com>
|
|
Cc: Dmitry Vyukov <dvyukov@google.com>
|
|
Cc: Jonathan Corbet <corbet@lwn.net>
|
|
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
Cc: Larry Woodman <lwoodman@redhat.com>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Matt Fleming <matt@codeblueprint.co.uk>
|
|
Cc: Michael S. Tsirkin <mst@redhat.com>
|
|
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Radim Krčmář <rkrcmar@redhat.com>
|
|
Cc: Rik van Riel <riel@redhat.com>
|
|
Cc: Toshimitsu Kani <toshi.kani@hpe.com>
|
|
Cc: kasan-dev@googlegroups.com
|
|
Cc: kvm@vger.kernel.org
|
|
Cc: linux-arch@vger.kernel.org
|
|
Cc: linux-doc@vger.kernel.org
|
|
Cc: linux-efi@vger.kernel.org
|
|
Cc: linux-mm@kvack.org
|
|
Link: http://lkml.kernel.org/r/3b605622a9fae5e588e5a13967120a18ec18071b.1500319216.git.thomas.lendacky@amd.com
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
(cherry picked from commit f2f931c6819467af5260a21c59fb787ce2863f92)
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
(cherry picked from commit 8370907399392a637a2e51b4db3368fb594db3a6)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
arch/x86/xen/enlighten_pv.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
|
|
index 290bc5ac9852..df1921751aa5 100644
|
|
--- a/arch/x86/xen/enlighten_pv.c
|
|
+++ b/arch/x86/xen/enlighten_pv.c
|
|
@@ -263,6 +263,7 @@ static void __init xen_init_capabilities(void)
|
|
setup_clear_cpu_cap(X86_FEATURE_MTRR);
|
|
setup_clear_cpu_cap(X86_FEATURE_ACC);
|
|
setup_clear_cpu_cap(X86_FEATURE_X2APIC);
|
|
+ setup_clear_cpu_cap(X86_FEATURE_SME);
|
|
|
|
/*
|
|
* Xen PV would need some work to support PCID: CR3 handling as well
|
|
--
|
|
2.14.2
|
|
|