From patchwork Wed Jan 17 14:31:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 862288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zM8fn3Jm0z9sQm; Thu, 18 Jan 2018 01:31:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1eboka-0000Bm-F1; Wed, 17 Jan 2018 14:31:36 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ebokZ-0000B7-0W for kernel-team@lists.ubuntu.com; Wed, 17 Jan 2018 14:31:35 +0000 Received: from 1.general.smb.uk.vpn ([10.172.193.28] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ebokY-0002oT-Nd for kernel-team@lists.ubuntu.com; Wed, 17 Jan 2018 14:31:34 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [SRU Trusty 2/2] UBUNTU: SAUCE: KVM: Fix spec_ctrl CPUID support for guests Date: Wed, 17 Jan 2018 15:31:29 +0100 Message-Id: <1516199491-7103-3-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516199491-7103-1-git-send-email-stefan.bader@canonical.com> References: <1516199491-7103-1-git-send-email-stefan.bader@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" CVE-2017-5753 CVE-2017-5715 The ordering of the internal enum in scatter.c is eax=0, exc, edx, ebx, so CR_EDX is 2. Fixes: 07dce5b ("UBUNTU: SAUCE: KVM: x86: Add speculative control CPUID support for guests") Signed-off-by: Stefan Bader --- arch/x86/kvm/cpuid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index c400546..ceb0535 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -396,7 +396,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, // TSC_ADJUST is emulated entry->ebx |= F(TSC_ADJUST); entry->edx &= kvm_cpuid_7_0_edx_x86_features; - entry->edx &= get_scattered_cpuid_leaf(7, 0, 3); + /* CR_EDX == 2 */ + entry->edx &= get_scattered_cpuid_leaf(7, 0, 2); } else { entry->ebx = 0; entry->edx = 0;