| Message ID | 51FF3127.5030206@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 05, 2013 at 12:59:19PM +0800, 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> Reviewed-by: Gleb Natapov <gleb@redhat.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; > } > -- > 1.8.1.4 -- Gleb. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)