From patchwork Mon Jul 10 19:29:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9833715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B6C5560318 for ; Mon, 10 Jul 2017 19:30:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C25526E4A for ; Mon, 10 Jul 2017 19:30:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20B7C283AF; Mon, 10 Jul 2017 19:30:01 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 AFCA926E4A for ; Mon, 10 Jul 2017 19:30:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754366AbdGJT36 (ORCPT ); Mon, 10 Jul 2017 15:29:58 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:34983 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754284AbdGJT35 (ORCPT ); Mon, 10 Jul 2017 15:29:57 -0400 Received: by mail-pf0-f172.google.com with SMTP id c73so54727485pfk.2 for ; Mon, 10 Jul 2017 12:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tU8Lr1ZnaQ+Mm99u7IoKoMm/fnEjmRd6El/CiqGLSNE=; b=nZl50ugz6Bp6EjRA2wopbrqxg2hfdyYDQyQmjVV6uW5AL65WEu8NHafog4o2ZbHbi3 KM4QfMc2K2ifuipPJtOEcmD/U53N8FzaTEhfIH0UvQtsxnIbhFQZpALVU0RX464J2MtY NIqm4NnKoL7yMhj9uqqSE6iD7xPR6UdJAXq5f2sbFtnqhUIb3efX7cwHONZEuT4YZs24 EnL3q5VXL9zM8I2piwZGPuK6KY/gxc0rFNQu++WgyS4JXsKvnHt8b77UlNouJ59+bRcj LrzGQQWq9uu99VqXzVIUA0yxod7XFQegKjeHk80J5xsR6lxlX7adLVLD36fj/oAFMAuU 2cbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tU8Lr1ZnaQ+Mm99u7IoKoMm/fnEjmRd6El/CiqGLSNE=; b=ihpO2r+EC6DgZZDbExjicgO4zp7flGzLPYQS6js9+mQjMf74tdXnJQiw+hbz2gYX3i 7FYNx+19J1r15eS32e25ECmj0enhyFriSz8RlnMie4x/BqnmmKLJfp2L4pgHAFJ9Id5s Htvl5h1tdwx358ibZxpDWH+H+BkW9jGRS3yXgLDI+7UD8L2AxFai5jw6PIeUW/xz921C ozeTdKTzMc1Ztj/aPRf+rZm2/OzaH4JKcrfrxj7WJrBN+Hlx6NsPZeRTvItDSSkIhMoo V8pE2tr4Hej6daOyfYHzBCR7rTP8pHzzhuCuYaVDmDEFZ4sPCkRIKydkMkHuzGKbEOZ/ u6JA== X-Gm-Message-State: AIVw112i7yFZiqyA+cTWHKf7cqmHHxn5A70vSyJX3m/VTB6qQCT6Taa5 THmql2QMjMN0QkuvclQ73w== X-Received: by 10.84.228.207 with SMTP id y15mr19563134pli.13.1499714996552; Mon, 10 Jul 2017 12:29:56 -0700 (PDT) Received: from turtle.sea.corp.google.com ([172.31.88.24]) by smtp.gmail.com with ESMTPSA id u2sm30201109pgn.28.2017.07.10.12.29.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jul 2017 12:29:55 -0700 (PDT) From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson Subject: [PATCH v2 3/3] kvm: nVMX: Validate the I/O bitmaps on nested VM-entry Date: Mon, 10 Jul 2017 12:29:04 -0700 Message-Id: <20170710192904.102893-3-jmattson@google.com> X-Mailer: git-send-email 2.13.2.725.g09c95d1e9-goog In-Reply-To: <20170710192904.102893-1-jmattson@google.com> References: <201707081510.ZhaGqybS%fengguang.wu@intel.com> <20170710192904.102893-1-jmattson@google.com> MIME-Version: 1.0 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 the SDM, if the “use I/O bitmaps” VM-execution control is 1, bits 11:0 of each I/O-bitmap address must be 0. Neither address should set any bits beyond the processor’s physical-address width. Signed-off-by: Jim Mattson --- arch/x86/kvm/vmx.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index eec9e0191311..7f27e7908477 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9594,6 +9594,19 @@ static void vmx_start_preemption_timer(struct kvm_vcpu *vcpu) ns_to_ktime(preemption_timeout), HRTIMER_MODE_REL); } +static int nested_vmx_check_io_bitmap_controls(struct kvm_vcpu *vcpu, + struct vmcs12 *vmcs12) +{ + if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS)) + return 0; + + if (!page_address_valid(vcpu, vmcs12->io_bitmap_a) || + !page_address_valid(vcpu, vmcs12->io_bitmap_b)) + return -EINVAL; + + return 0; +} + static int nested_vmx_check_msr_bitmap_controls(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) { @@ -10288,6 +10301,9 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) vmcs12->guest_activity_state != GUEST_ACTIVITY_HLT) return VMXERR_ENTRY_INVALID_CONTROL_FIELD; + if (nested_vmx_check_io_bitmap_controls(vcpu, vmcs12)) + return VMXERR_ENTRY_INVALID_CONTROL_FIELD; + if (nested_vmx_check_msr_bitmap_controls(vcpu, vmcs12)) return VMXERR_ENTRY_INVALID_CONTROL_FIELD;