Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 310bc76c authored by Rusty Russell's avatar Rusty Russell Committed by Avi Kivity
Browse files

KVM: Return if the pdptrs are invalid when the guest turns on PAE. 



Don't fall through and turn on PAE in this case.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 394b6e59

drivers/kvm/kvm_main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -558,6 +558,7 @@ void set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
		   && !load_pdptrs(vcpu, vcpu->cr3)) {

		   && !load_pdptrs(vcpu, vcpu->cr3)) {

		printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");

		printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");

		inject_gp(vcpu);

		inject_gp(vcpu);

		return;

	}

	}





	if (cr4 & X86_CR4_VMXE) {

	if (cr4 & X86_CR4_VMXE) {