From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH] KVM: MMU: fix check the reserved bits on the gpte of
 L2
Date: Wed, 07 Aug 2013 16:06:57 +0200
Message-ID: <52025481.8050705@redhat.com>
References: <51FF3127.5030206@linux.vnet.ibm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Gleb Natapov <gleb@redhat.com>,
	Jan Kiszka <jan.kiszka@siemens.com>,
	LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <51FF3127.5030206@linux.vnet.ibm.com>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On 08/05/2013 06:59 AM, Xiao Guangrong wrote:
> Current code always uses arch.mmu to check the reserved bits on guest gpte
> which is valid only for L1 guest, we should use arch.nested_mmu instead when
> we translate gva to gpa for the L2 guest
>
> Fix it by using @mmu instead since it is adapted to the current mmu mode
> automatically
>
> The bug can be triggered when nested npt is used and L1 guest and L2 guest
> use different mmu mode
>
> Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
> ---
>   arch/x86/kvm/paging_tmpl.h | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
> index 7769699..3a75828 100644
> --- a/arch/x86/kvm/paging_tmpl.h
> +++ b/arch/x86/kvm/paging_tmpl.h
> @@ -218,8 +218,7 @@ retry_walk:
>   		if (unlikely(!is_present_gpte(pte)))
>   			goto error;
>
> -		if (unlikely(is_rsvd_bits_set(&vcpu->arch.mmu, pte,
> -					      walker->level))) {
> +		if (unlikely(is_rsvd_bits_set(mmu, pte, walker->level))) {
>   			errcode |= PFERR_RSVD_MASK | PFERR_PRESENT_MASK;
>   			goto error;
>   		}
>

Applied, thanks.

Paolo