]> err.no Git - linux-2.6/commitdiff
KVM: Return if the pdptrs are invalid when the guest turns on PAE.
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 23 Jul 2007 07:11:02 +0000 (17:11 +1000)
committerAvi Kivity <avi@qumranet.com>
Sat, 13 Oct 2007 08:18:19 +0000 (10:18 +0200)
Don't fall through and turn on PAE in this case.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
drivers/kvm/kvm_main.c

index f0fc8d9e71e67d9fb5fd17322f3d3799895ef5e8..093cea36194b093cdc359f3f46e05729ce77088b 100644 (file)
@@ -558,6 +558,7 @@ void set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
                   && !load_pdptrs(vcpu, vcpu->cr3)) {
                printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");
                inject_gp(vcpu);
+               return;
        }
 
        if (cr4 & X86_CR4_VMXE) {