From patchwork Mon Apr 26 08:48:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 95020 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3Q8muEZ027862 for ; Mon, 26 Apr 2010 08:48:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829Ab0DZIsy (ORCPT ); Mon, 26 Apr 2010 04:48:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25274 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804Ab0DZIsq (ORCPT ); Mon, 26 Apr 2010 04:48:46 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mjoZ012821 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Apr 2010 04:48:46 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mjAx027592 for ; Mon, 26 Apr 2010 04:48:45 -0400 Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 828BC250AD9; Mon, 26 Apr 2010 11:48:43 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 5/5] KVM: MMU: Fix check for cr3 outside guest memory Date: Mon, 26 Apr 2010 11:48:43 +0300 Message-Id: <1272271723-9070-6-git-send-email-avi@redhat.com> In-Reply-To: <1272271723-9070-1-git-send-email-avi@redhat.com> References: <1272271723-9070-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Apr 2010 08:48:56 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 6e925b3..e3acc9e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2083,7 +2083,7 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) } else root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT; - if (mmu_check_root(vcpu, root_gfn)) + if (!direct && mmu_check_root(vcpu, root_gfn)) return 1; sp = kvm_mmu_get_page(vcpu, root_gfn, i << 30, PT32_ROOT_LEVEL, direct,