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

Commit 73c31bd9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Greg Kroah-Hartman
Browse files

KVM: nVMX: handle page fault in vmread 



commit f7eea636c3d505fe6f1d1066234f1aaf7171b681 upstream.

The implementation of vmread to memory is still incomplete, as it
lacks the ability to do vmread to I/O memory just like vmptrst.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e60900c

arch/x86/kvm/vmx.c

+5 −2
Original line number Diff line number Diff line
@@ -8757,6 +8757,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) 
	u32 vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);

	gva_t gva = 0;

	struct vmcs12 *vmcs12;

	struct x86_exception e;



	if (!nested_vmx_check_permission(vcpu))

		return 1;
@@ -8798,8 +8799,10 @@ static int handle_vmread(struct kvm_vcpu *vcpu) 
				vmx_instruction_info, true, &gva))

			return 1;

		/* _system ok, nested_vmx_check_permission has verified cpl=0 */

		kvm_write_guest_virt_system(vcpu, gva, &field_value,

					    (is_long_mode(vcpu) ? 8 : 4), NULL);

		if (kvm_write_guest_virt_system(vcpu, gva, &field_value,

						(is_long_mode(vcpu) ? 8 : 4),

						NULL))

			kvm_inject_page_fault(vcpu, &e);

	}



	nested_vmx_succeed(vcpu);