From patchwork Mon Oct 15 16:41:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10642179 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 7D8B0925 for ; Mon, 15 Oct 2018 16:41:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6994929A74 for ; Mon, 15 Oct 2018 16:41:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A34229A7E; Mon, 15 Oct 2018 16:41:32 +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 0333C29A74 for ; Mon, 15 Oct 2018 16:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726691AbeJPA13 (ORCPT ); Mon, 15 Oct 2018 20:27:29 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:45557 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726525AbeJPA13 (ORCPT ); Mon, 15 Oct 2018 20:27:29 -0400 Received: by mail-pf1-f201.google.com with SMTP id p89-v6so20650857pfj.12 for ; Mon, 15 Oct 2018 09:41:30 -0700 (PDT) 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=FLgOApEK059X96s9O/CDyf4l/0n9lBNgZPyg7eBPtI4=; b=GhZnzEn2BDFjKyliJKB1JJLZo2TvtaqxjngdZYS5dhhHfiXoFuOwZ3vzU/+x3/10ur BH483VsJvYhWZzfhhvd+FDs0wNbdZtZLrabWbLALP5p2Dj4rVoxapyAutLLSCnFz1dlc o0Va179m6hcR6P7NbYduQm9EFo6TS39hz8tlyP3yotZPhsMQftOCPpPNMvdfeHKFTACI fn6oWoaJJuzifmosOPO5cU+JXMWkAWna8gQ2l3/G9UpRMhDWiBRAP2kDYkEI7GPP2l4G UuTHpSEqVXzdQDrSjt9hLrQ/Jq0Kn9Lu9F7Hgo8/pAcEQ7zIqKkqz9mVW2f+PoWYski1 oVwQ== 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=FLgOApEK059X96s9O/CDyf4l/0n9lBNgZPyg7eBPtI4=; b=bbDcRmVuWo0Ez7ctcOVh2A2PH42XK8PQA3DHPmsHNQX+Sz4TL5oU4W9JZeI9g1CTUx rkIRc161SXBCkZyczdggvOddxh4+Vy4ZTZOQls1RC0bUPhFXtX5Cp/TBcqTKYwCe9xOO Il5RX+ECxjCnaFx4a1bsnqgLPt626uLGCH61xLHA/mTAOhKmvgvJicRQzLIJi1LH3F2Z gg12Ehm+NfcntvncS3/sJek8ebLtiMJEAJFCzz6FkfdKv4SlWsdboctWxbEVlmX1h9ao 5idxnglX4hAvuhKd1FWHfMch/+V/KG5OZ9z46H2FkWdlc3K/jhOJLKWxSaUHXhoSs5cG T8qA== X-Gm-Message-State: ABuFfojr6exxY3zy7deEtNVxV41geTHbi5inCEHPtfYzH4mpfUsVwNpc IG5zJ4nOrw6z2X1xReyEvueo0wdNPKu3KUsY50NEscwrxohji8wWmy/JfO27lFxpPvDQRqD6WPb 7Nkc0+zp7dnEbsSVrOuJZKa1iMT6s1GAHMfdhQhTTkHdvm1awtkKJ2+hxEHU1I8g= X-Google-Smtp-Source: ACcGV62YOLHcb7kQF1Zgmn47HQ2mCj+EVKUd2DfGcR8XikxwjXn51nh2z18mpnMEuuRNsNYWohS7Q/G/XgfeHg== X-Received: by 2002:a62:a9b:: with SMTP id 27-v6mr8690249pfk.56.1539621689714; Mon, 15 Oct 2018 09:41:29 -0700 (PDT) Date: Mon, 15 Oct 2018 09:41:23 -0700 Message-Id: <20181015164124.225764-1-jmattson@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.1.331.ge82ca0e54c-goog Subject: [PATCH v2 1/2] kvm: x86: Bounds-check argument to x86_exception_has_error_code From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Marc Orr , 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 x86_exception_has_error_code should deterministically return false if its operand is greater than 32. Fixes: 0447378a4a793 ("kvm: vmx: Nested VM-entry prereqs for event inj.") Cc: Marc Orr Cc: Sean Christopherson Signed-off-by: Jim Mattson Reviewed-by: Krish Sadhukhan Reviewed-by: Marc Orr --- arch/x86/kvm/x86.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index 67b9568613f3..152b20d06a48 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -116,7 +116,8 @@ static inline bool x86_exception_has_error_code(unsigned int vector) BIT(NP_VECTOR) | BIT(SS_VECTOR) | BIT(GP_VECTOR) | BIT(PF_VECTOR) | BIT(AC_VECTOR); - return (1U << vector) & exception_has_error_code; + WARN_ON_ONCE(vector >= 32); + return vector < 32 && (1U << vector) & exception_has_error_code; } static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)