diff options
| author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2010-07-15 23:19:51 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-01 23:40:56 -0400 |
| commit | fa1de2bfc0feb7245328ad25fb3e6d5cd2c903b4 (patch) | |
| tree | bc993022b24c60c2ea2452ca6d7f5ed0faf0a322 /arch/x86/kvm/paging_tmpl.h | |
| parent | 6e3e243c3b6e0bbd18c6ce0fbc12bc3fe2d77b34 (diff) | |
KVM: MMU: add missing reserved bits check in speculative path
In the speculative path, we should check guest pte's reserved bits just as
the real processor does
Reported-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index d9a2742014e3..51ef9097960d 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
| @@ -638,8 +638,9 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, | |||
| 638 | return -EINVAL; | 638 | return -EINVAL; |
| 639 | 639 | ||
| 640 | gfn = gpte_to_gfn(gpte); | 640 | gfn = gpte_to_gfn(gpte); |
| 641 | if (gfn != sp->gfns[i] || | 641 | if (is_rsvd_bits_set(vcpu, gpte, PT_PAGE_TABLE_LEVEL) |
| 642 | !is_present_gpte(gpte) || !(gpte & PT_ACCESSED_MASK)) { | 642 | || gfn != sp->gfns[i] || !is_present_gpte(gpte) |
| 643 | || !(gpte & PT_ACCESSED_MASK)) { | ||
| 643 | u64 nonpresent; | 644 | u64 nonpresent; |
| 644 | 645 | ||
| 645 | if (is_present_gpte(gpte) || !clear_unsync) | 646 | if (is_present_gpte(gpte) || !clear_unsync) |