diff options
author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2010-08-28 07:22:46 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:51:47 -0400 |
commit | bc32ce2152406431acf4daf4a81dc1664bb7b91b (patch) | |
tree | ae2f6737d56c8d977485489d58d08b3528fd2d6e /arch/x86/kvm/mmu.c | |
parent | 0beb8d660425aab339ff68e6f4d4528739e8fc4f (diff) |
KVM: MMU: fix wrong not write protected sp report
The audit code reports some sp not write protected in current code, it's just the
bug in audit_write_protection(), since:
- the invalid sp not need write protected
- using uninitialize local variable('gfn')
- call kvm_mmu_audit() out of mmu_lock's protection
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 1c784b96dac3..68575dc32ec7 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -3708,16 +3708,17 @@ static void audit_write_protection(struct kvm_vcpu *vcpu) | |||
3708 | struct kvm_memory_slot *slot; | 3708 | struct kvm_memory_slot *slot; |
3709 | unsigned long *rmapp; | 3709 | unsigned long *rmapp; |
3710 | u64 *spte; | 3710 | u64 *spte; |
3711 | gfn_t gfn; | ||
3712 | 3711 | ||
3713 | list_for_each_entry(sp, &vcpu->kvm->arch.active_mmu_pages, link) { | 3712 | list_for_each_entry(sp, &vcpu->kvm->arch.active_mmu_pages, link) { |
3714 | if (sp->role.direct) | 3713 | if (sp->role.direct) |
3715 | continue; | 3714 | continue; |
3716 | if (sp->unsync) | 3715 | if (sp->unsync) |
3717 | continue; | 3716 | continue; |
3717 | if (sp->role.invalid) | ||
3718 | continue; | ||
3718 | 3719 | ||
3719 | slot = gfn_to_memslot(vcpu->kvm, sp->gfn); | 3720 | slot = gfn_to_memslot(vcpu->kvm, sp->gfn); |
3720 | rmapp = &slot->rmap[gfn - slot->base_gfn]; | 3721 | rmapp = &slot->rmap[sp->gfn - slot->base_gfn]; |
3721 | 3722 | ||
3722 | spte = rmap_next(vcpu->kvm, rmapp, NULL); | 3723 | spte = rmap_next(vcpu->kvm, rmapp, NULL); |
3723 | while (spte) { | 3724 | while (spte) { |