|
@@ -9595,6 +9595,19 @@ static void vmx_start_preemption_timer(struct kvm_vcpu *vcpu)
|
|
|
ns_to_ktime(preemption_timeout), HRTIMER_MODE_REL);
|
|
|
}
|
|
|
|
|
|
+static int nested_vmx_check_io_bitmap_controls(struct kvm_vcpu *vcpu,
|
|
|
+ struct vmcs12 *vmcs12)
|
|
|
+{
|
|
|
+ if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ if (!page_address_valid(vcpu, vmcs12->io_bitmap_a) ||
|
|
|
+ !page_address_valid(vcpu, vmcs12->io_bitmap_b))
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int nested_vmx_check_msr_bitmap_controls(struct kvm_vcpu *vcpu,
|
|
|
struct vmcs12 *vmcs12)
|
|
|
{
|
|
@@ -10299,6 +10312,9 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
|
|
|
vmcs12->guest_activity_state != GUEST_ACTIVITY_HLT)
|
|
|
return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
|
|
|
|
|
|
+ if (nested_vmx_check_io_bitmap_controls(vcpu, vmcs12))
|
|
|
+ return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
|
|
|
+
|
|
|
if (nested_vmx_check_msr_bitmap_controls(vcpu, vmcs12))
|
|
|
return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
|
|
|
|