From patchwork Fri Feb 8 21:45:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10803797 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 08B0A14E1 for ; Fri, 8 Feb 2019 21:46:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED97D2EC48 for ; Fri, 8 Feb 2019 21:46:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E18D62ECE0; Fri, 8 Feb 2019 21:46:14 +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 8CB822EC48 for ; Fri, 8 Feb 2019 21:46:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727397AbfBHVqN (ORCPT ); Fri, 8 Feb 2019 16:46:13 -0500 Received: from mail-yb1-f201.google.com ([209.85.219.201]:39928 "EHLO mail-yb1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727394AbfBHVqN (ORCPT ); Fri, 8 Feb 2019 16:46:13 -0500 Received: by mail-yb1-f201.google.com with SMTP id h2so1271101ybg.6 for ; Fri, 08 Feb 2019 13:46:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=gqJYHMpgA0y3dm88ISmQeALqnDNZBOvym+E2uUrHuE8=; b=EaHpu6RPVRyiTnPly/gVtcVSeTaAo9KOLgiQNvdV0nIBnPdGIpn+RwJpAgoyKWgkKd zqhIhum+1qybluXEQUtzF5FQ5lOSo/nhHEOGRwbgCL3Gg1UDc0BfSkibYLfxz81BNHRk aCvW2jL3NrO2qU9GZ2JbRlQrh9IDtT80oFbzdD/BYeLJGdTceJ9KmId9iDR0pfih9s25 XwpPiGXNylQwypEBpLX9VY+lVc9LqmCvgbFPndzVgbhYGGylLpQnqAsoC9GUgMsdNOq7 dgQRPa4vDxLI0yOgCRqBIFOt7GKpe3x9vjTIjZpGSLkIUI44SuA45uu+Of3qIMV+kK9H W3Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gqJYHMpgA0y3dm88ISmQeALqnDNZBOvym+E2uUrHuE8=; b=o3sw1odVnsD7Hcl1esS4s6xaQjyAkVw+b2M/oD7ZXblXP/W/CrqxlU9vu9Z4QYCTrG +Pb+weA3rHMbTrQd6560Nq4Zm1TK58Z2oR+85RaOxq9ZzGd4wsX6VjPg6/6dZRwMZT12 tKXnqkBqSbmvoDiBceq7NxKrcuMMzej90kvoNv72NQnltXJtIHRoKsk2QaX3elVg6HTg qB6m51ZqcijtzIv3QwFDun3b1SQNOEmJhikYMnXSIYlQ9bEglv/NOoejycJ7GuhnEfxo lKBP24YKVrvKa3/zcrhUbVrSvTvBBb1jxlsr3PNFbAsdLK42LNlKSWoEnEMPeUWUl8S3 PKmA== X-Gm-Message-State: AHQUAub6BPZfBkpS8gPKL3qSPqJDBOy6HTHPfpbXw7he74v2lqN1d9Wg zcJB1cgAEsBFT7f6TWNWA4EKgVYCVk1ty8YmQ+wXpIujgsSM8+v7spThwyFoV9opYSmi8EGJTF/ jzLx7BB1EOq8ulwu3YBBj+BxDWpMZGFhvZqThdEGP9XbFiWc3RykXd2Hnk2HKzvA= X-Google-Smtp-Source: AHgI3IZCHa14j9BMIfsWWwLFsqhgQgaOPdUvqUb8JDZiiG/ES+OV1IpzZdGfcBy2y+vxAxHrsbhFOoow2PsSkQ== X-Received: by 2002:a5b:c82:: with SMTP id i2mr9675265ybq.25.1549662372188; Fri, 08 Feb 2019 13:46:12 -0800 (PST) Date: Fri, 8 Feb 2019 13:45:56 -0800 In-Reply-To: Message-Id: <20190208214557.5735-1-jmattson@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH v2 1/2] kvm: x86: Clear {ebx,ecx,edx} from CPUID leaf 0x8000001a From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Peter Shier , Sean Christopherson 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 --- 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; From patchwork Fri Feb 8 21:45:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10803799 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 CE04B14E1 for ; Fri, 8 Feb 2019 21:46:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBF962E873 for ; Fri, 8 Feb 2019 21:46:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADAB42ED3D; Fri, 8 Feb 2019 21:46:25 +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 5BD922E873 for ; Fri, 8 Feb 2019 21:46:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbfBHVqY (ORCPT ); Fri, 8 Feb 2019 16:46:24 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:37548 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726244AbfBHVqY (ORCPT ); Fri, 8 Feb 2019 16:46:24 -0500 Received: by mail-vs1-f74.google.com with SMTP id f16so1902005vsr.4 for ; Fri, 08 Feb 2019 13:46:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=dGMu5arY9MsaX8IY/Qz0Vtbm8IxIxEeHINa79Fr1IMM=; b=sfHzg/WoLY4IWjB5F1Yx5CyTr3lya/rqNlWIlvdSb1Jp9sR62Sai4MnzDbYFZuSWD6 hHtD0NOIfZ/sfdRFGelG5eEqdPW3YcpI76Mu9COrJKzQna2lIWjYpkaYR/vRvuSUVwHF M+BdRGdNcZQgQWYUf2/4BgvDbHpYV2pTLwe4QqoxWRAQhyoIKsGuSqC3fJoPqa2KA8bX BANDjdygFEZOekrkEm9jl6vpIEf+PQaqFwqkl8Tmy096ZwMI9ULvBBRubaT4sabWeaIH Qv60OmBmqmqBhilWy61GBmkamD1Sb5FsDS8Y/t7mVq+avRH54zOyOXUhEW7SNkynR3GC 5dWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=dGMu5arY9MsaX8IY/Qz0Vtbm8IxIxEeHINa79Fr1IMM=; b=i0znwzoJVAJinBRlSIAg++yhXSUxz610jKagbv+cBX3Pu4ruA5sHSpcGJl3/YTSG10 0aq1ax7pt2OUe5hY5PcNZXbIyookXaHd3TsblzMdaGKV4h34uszByMVDODY/oLIivxM9 c39fb/MHkcFDkM83qHiTadZpoaDirhpPlc2Ei+VdAdU6K8OrCOUtnqpWvsvurva6zcCT AHMI3vwNcl4QfekRuxn3yP0f0yg8JUTRJTSKEiqN1BuNow+1fQMfTBsrrxTkrW98lkFc 3Lm9Qp67hb/6arWWIg55UB4Va1GnM/PyW50/wJnNuWw3q0XShM7IFfyFjmueFrI0L82Y Gwbg== X-Gm-Message-State: AHQUAuaYeBd8gC/poesi2VFOKJgF9wXfLUg+F/aSV90NKwxBirMTXlP4 Kh8KoKO+UsgVB3ydZzPY9vGHmvF69ILqWruZ/LFuLJ7KzfZMXMKzCVCF06Yd9mYCBOgXKAIdb0r WSf9fMOwknrQs7mf4V16+pf64ODQS0Jc3Q0kOmmruX5vP6PQD0fWsvKmGWoEFnt8= X-Google-Smtp-Source: AHgI3IbfReDCrZ0wZVvMg9fAGkPYO51jvRMKKolMZLY+u1L9RWsuwn7F2C36aVWPez3GuEMGjrSPbuHpPqpf7A== X-Received: by 2002:ab0:2a56:: with SMTP id p22mr14758517uar.7.1549662383216; Fri, 08 Feb 2019 13:46:23 -0800 (PST) Date: Fri, 8 Feb 2019 13:45:57 -0800 In-Reply-To: <20190208214557.5735-1-jmattson@google.com> Message-Id: <20190208214557.5735-2-jmattson@google.com> Mime-Version: 1.0 References: <20190208214557.5735-1-jmattson@google.com> X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH v2 2/2] kvm: x86: Clear {ebx,ecx,edx} from CPUID leaf 9 From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Sean Christopherson 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 2 of the SDM, output registers %ebx, %ecx, and %edx of CPUID leaf 9 (the direct cache access information leaf) 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") Suggested-by: Sean Christopherson Signed-off-by: Jim Mattson Reviewed-by: Sean Christopherson --- 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 183f40cd3362..d9b6d90fd062 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -510,6 +510,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, break; } case 9: + entry->ebx = entry->ecx = entry->edx = 0; break; case 0xa: { /* Architectural Performance Monitoring */ struct x86_pmu_capability cap;