Commit a2ad080b authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: nVMX: Sanitize primary processor-based VM-execution controls with eVMCS too 



The only unsupported primary processor-based VM-execution control at the
moment is CPU_BASED_ACTIVATE_TERTIARY_CONTROLS and KVM doesn't expose it
in nested VMX feature MSRs anyway (see nested_vmx_setup_ctls_msrs())
but in preparation to inverting "unsupported with eVMCS" checks (and
for completeness) it's better to sanitize MSR_IA32_VMX_PROCBASED_CTLS/
MSR_IA32_VMX_TRUE_PROCBASED_CTLS too.

No functional change intended.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20221104144708.435865-2-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 129c48cd

arch/x86/kvm/vmx/hyperv.c

+12 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ enum evmcs_revision { 
enum evmcs_ctrl_type {

	EVMCS_EXIT_CTRLS,

	EVMCS_ENTRY_CTRLS,

	EVMCS_EXEC_CTRL,

	EVMCS_2NDEXEC,

	EVMCS_PINCTRL,

	EVMCS_VMFUNC,
@@ -374,6 +375,9 @@ static const u32 evmcs_unsupported_ctrls[NR_EVMCS_CTRLS][NR_EVMCS_REVISIONS] = { 
	[EVMCS_ENTRY_CTRLS] = {

		[EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_VMENTRY_CTRL,

	},

	[EVMCS_EXEC_CTRL] = {

		[EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_EXEC_CTRL,

	},

	[EVMCS_2NDEXEC] = {

		[EVMCSv1_LEGACY] = EVMCS1_UNSUPPORTED_2NDEXEC,

	},
@@ -434,6 +438,10 @@ void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 * 
			unsupported_ctrls |= VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL;

		ctl_high &= ~unsupported_ctrls;

		break;

	case MSR_IA32_VMX_PROCBASED_CTLS:

	case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:

		ctl_high &= ~evmcs_get_unsupported_ctls(EVMCS_EXEC_CTRL);

		break;

	case MSR_IA32_VMX_PROCBASED_CTLS2:

		ctl_high &= ~evmcs_get_unsupported_ctls(EVMCS_2NDEXEC);

		break;
@@ -461,6 +469,10 @@ int nested_evmcs_check_controls(struct vmcs12 *vmcs12) 
					       vmcs12->pin_based_vm_exec_control)))

		return -EINVAL;



	if (CC(!nested_evmcs_is_valid_controls(EVMCS_EXEC_CTRL,

					       vmcs12->cpu_based_vm_exec_control)))

		return -EINVAL;



	if (CC(!nested_evmcs_is_valid_controls(EVMCS_2NDEXEC,

					       vmcs12->secondary_vm_exec_control)))

		return -EINVAL;