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

Commit bc441211 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: nVMX: Restore a preemption timer consistency check 



A recently added preemption timer consistency check was unintentionally
dropped when the consistency checks were being reorganized to match the
SDM's ordering.

Fixes: 461b4ba4 ("KVM: nVMX: Move the checks for VM-Execution Control Fields to a separate helper function")
Cc: Krish Sadhukhan <krish.sadhukhan@oracle.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6b1971c6

arch/x86/kvm/vmx/nested.c

+4 −0
Original line number Diff line number Diff line
@@ -2473,6 +2473,10 @@ static int nested_check_vm_execution_controls(struct kvm_vcpu *vcpu, 
	    (nested_cpu_has_vpid(vmcs12) && !vmcs12->virtual_processor_id))

		return -EINVAL;



	if (!nested_cpu_has_preemption_timer(vmcs12) &&

	    nested_cpu_has_save_preemption_timer(vmcs12))

		return -EINVAL;



	if (nested_cpu_has_ept(vmcs12) &&

	    !valid_ept_address(vcpu, vmcs12->ept_pointer))

		return -EINVAL;