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

Commit dc7e795e authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs" 



This reverts commit 6c20e1442bb1c62914bb85b7f4a38973d2a423ba.

To my understanding, it became obsolete with the advent of the more
robust check in mmu_alloc_roots (89da4ff17f). Moreover, it prevents
the conceptually safe pattern

 1. set sregs
 2. register mem-slots
 3. run vcpu

by setting a sticky triple fault during step 1.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 6098ca93

arch/x86/kvm/x86.c

+1 −7
Original line number Diff line number Diff line
@@ -4326,13 +4326,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 


	vcpu->arch.cr2 = sregs->cr2;

	mmu_reset_needed |= vcpu->arch.cr3 != sregs->cr3;



	down_read(&vcpu->kvm->slots_lock);

	if (gfn_to_memslot(vcpu->kvm, sregs->cr3 >> PAGE_SHIFT))

	vcpu->arch.cr3 = sregs->cr3;

	else

		set_bit(KVM_REQ_TRIPLE_FAULT, &vcpu->requests);

	up_read(&vcpu->kvm->slots_lock);



	kvm_set_cr8(vcpu, sregs->cr8);