diff options
| author |   Rusty Russell <rusty@rustcorp.com.au> | 2007-07-31 20:45:03 +1000 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2007-10-13 10:18:22 +0200 |
| commit | fb764416492a1204c20fdf4507019012d27bd1a2 (patch) | |
| tree | f20613a42ae71afd741b65a0e544d865acda9c12 /drivers/kvm/kvm_main.c | |
| parent | KVM: VMX: Add cpu consistency check (diff) | |
| download | linux-dev-fb764416492a1204c20fdf4507019012d27bd1a2.tar.xz linux-dev-fb764416492a1204c20fdf4507019012d27bd1a2.zip | |
KVM: Don't assign vcpu->cr3 if it's invalid: check first, set last
sSigned-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
| -rw-r--r-- | drivers/kvm/kvm_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 2be6b1ca1a06..5dc601702782 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -579,7 +579,6 @@ void set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) } } - vcpu->cr3 = cr3; mutex_lock(&vcpu->kvm->lock); /* * Does the new cr3 value map to physical memory? (Note, we @@ -592,8 +591,10 @@ void set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) */ if (unlikely(!gfn_to_memslot(vcpu->kvm, cr3 >> PAGE_SHIFT))) inject_gp(vcpu); - else + else { + vcpu->cr3 = cr3; vcpu->mmu.new_cr3(vcpu); + } mutex_unlock(&vcpu->kvm->lock); } EXPORT_SYMBOL_GPL(set_cr3); |