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

Commit 2e5b0bd9 authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

kvm: nVMX: Don't validate disabled secondary controls 



According to the SDM, if the "activate secondary controls" primary
processor-based VM-execution control is 0, no checks are performed on
the secondary processor-based VM-execution controls.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0266c894

arch/x86/kvm/vmx.c

+4 −3
Original line number Diff line number Diff line
@@ -10240,9 +10240,10 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	if (!vmx_control_verify(vmcs12->cpu_based_vm_exec_control,

				vmx->nested.nested_vmx_procbased_ctls_low,

				vmx->nested.nested_vmx_procbased_ctls_high) ||

	    (nested_cpu_has(vmcs12, CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) &&

	     !vmx_control_verify(vmcs12->secondary_vm_exec_control,

				 vmx->nested.nested_vmx_secondary_ctls_low,

				vmx->nested.nested_vmx_secondary_ctls_high) ||

				 vmx->nested.nested_vmx_secondary_ctls_high)) ||

	    !vmx_control_verify(vmcs12->pin_based_vm_exec_control,

				vmx->nested.nested_vmx_pinbased_ctls_low,

				vmx->nested.nested_vmx_pinbased_ctls_high) ||