From patchwork Fri Feb 8 17:41:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10803559 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77746922 for ; Fri, 8 Feb 2019 17:41:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67D962EC5E for ; Fri, 8 Feb 2019 17:41:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C4BF2EC7A; Fri, 8 Feb 2019 17:41:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FC302EC5E for ; Fri, 8 Feb 2019 17:41:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727541AbfBHRl3 (ORCPT ); Fri, 8 Feb 2019 12:41:29 -0500 Received: from mail-it1-f202.google.com ([209.85.166.202]:44781 "EHLO mail-it1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727291AbfBHRl3 (ORCPT ); Fri, 8 Feb 2019 12:41:29 -0500 Received: by mail-it1-f202.google.com with SMTP id x82so7154759ita.9 for ; Fri, 08 Feb 2019 09:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=6TM/rHdMZKmmF44AjyTmMqnJVS3gb7wLyI9vNESYl9I=; b=p2BSn2WSXILC/RNchsvmSIjO7Ui7wJeS2tSF/aXVR5vaOLO/ESLb9davOjDDyIoXbZ 9Npg4mDWNbIjhaXK+jCjSqF8SxnzHbacpj1wpp5OlCs5UqhEMK4d4KbtvawEgtGffRFn fcrn+b41H815Qmpaftc+8QBwkcY1w7ay4lA4SNC/KUGfI6Boeblp2QglvErNla112Mfz g9RSWe3Spv4QGG0LW4fSytRTUrdz4ZNsvULGKdDDG1i8aB58ns8PcBRPo9DDcN4kUPPe YggLEBKV7BLtT7OguTzDhk32iA5vWDeUuVKsZSicW0Y/TK02yYTbEaLLMmaD5zP8GCB9 tagg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=6TM/rHdMZKmmF44AjyTmMqnJVS3gb7wLyI9vNESYl9I=; b=qCfG21Xmwajd/38WllDf3+P4wIz2qukyliD8ozzEWwmRvJTO3IK7gfrVtPHdh/CFOW XJDeBzc/gbuRc6IYLLZBudUTNawacm7vaZDJArihIpgnZmwe3hu4goFByj+p2jbJifr1 UAkab6YqorzwG/QpekyFQaIFqcQuDRBaom9JeDIa8snRac+OgI5qErBg5t6+XR4pplcd t3xwop9dl7ET/3CL0jVXPXGo3sLE8o55cDVYhLGCDH01TOQgOR5/hfV9A4TkQXdlsxwl U1U4/qZLD6z2PmPYiKIsNvAoPo6tbXYgjWKYzVDzQcw3hQPjVt+32c9/b/EBxm/KQ/T6 WbjQ== X-Gm-Message-State: AHQUAuYgKFkGew70Z2pm85ITc+T5JnJd1TuGTKLvgMbbc5rZZIwhliwW +sP1BQdtJX8DE9TtHPR5S++bKvJbBQZL0WnqkeOSlv9IdTLNmFE0yi6NrwkonceUj5C44541nLr aYdPImFbafryq7/2GzS/TWkXI+lb4i/GSOnvdM+AS2IyAHBZXtP3L06Muu0Ru5ZM= X-Google-Smtp-Source: AHgI3IZ7TAd4eyMb0RSZe9BudAPds/LCuIwxbwu4lGMKhMIXRL1jgB2JEvvA3Jcy534xlkJclaLpFsVuHs/6nQ== X-Received: by 2002:a24:6504:: with SMTP id u4mr9886387itb.25.1549647688599; Fri, 08 Feb 2019 09:41:28 -0800 (PST) Date: Fri, 8 Feb 2019 09:41:10 -0800 Message-Id: <20190208174110.122127-1-jmattson@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH] kvm: x86: Clear {ebx,ecx,edx} from CPUID leaf 0x8000001a From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Peter Shier Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to volume 3 of the APM, appendix E, CPUID Fn8000_001A_E[D,C,B]X are reserved. Since we have no way of knowing what these fields will be used for, they should not be whitelisted. Fixes: 24c82e576b78 ("KVM: Sanitize cpuid") Signed-off-by: Jim Mattson Reviewed-by: Peter Shier Reviewed-by: Sean Christopherson Reviewed-by: Peter Shier >> Reviewed-by: Sean --- arch/x86/kvm/cpuid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index bbffa6c54697..183f40cd3362 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -696,6 +696,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, entry->ecx = entry->edx = 0; break; case 0x8000001a: + entry->ebx = entry->ecx = entry->edx = 0; break; case 0x8000001d: break;