openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: MMU: unalias gfn before sp->gfns[] comparison in sync_page 

sp->gfns[] contain unaliased gfns, but gpte might contain pointer
to aliased region.

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Xiao Guangrong 2010-05-13 10:08:08 +08:00 committed by Avi Kivity
parent 6d74229f01
commit f55c3f419a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/kvm/paging_tmpl.h
View File

@ -586,7 +586,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
unsigned pte_access; unsigned pte_access;
pt_element_t gpte; pt_element_t gpte;
gpa_t pte_gpa; gpa_t pte_gpa;
gfn_t gfn = sp->gfns[i]; gfn_t gfn;
if (!is_shadow_present_pte(sp->spt[i])) if (!is_shadow_present_pte(sp->spt[i]))
continue; continue;
@ -597,8 +597,9 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
sizeof(pt_element_t))) sizeof(pt_element_t)))
return -EINVAL; return -EINVAL;
if (gpte_to_gfn(gpte) != gfn || !is_present_gpte(gpte) || gfn = gpte_to_gfn(gpte);
!(gpte & PT_ACCESSED_MASK)) { if (unalias_gfn(vcpu->kvm, gfn) != sp->gfns[i] ||
!is_present_gpte(gpte) || !(gpte & PT_ACCESSED_MASK)) {
u64 nonpresent; u64 nonpresent;
rmap_remove(vcpu->kvm, &sp->spt[i]); rmap_remove(vcpu->kvm, &sp->spt[i]);