Commit a4d956b9 authored Dec 28, 2019 by Miaohe Lin Committed by Paolo Bonzini Jan 21, 2020

KVM: nVMX: vmread should not set rflags to specify success in case of #PF



In case writing to vmread destination operand result in a #PF, vmread
should not call nested_vmx_succeed() to set rflags to specify success.
Similar to as done in VMPTRST (See handle_vmptrst()).

Reviewed-by: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: stable@vger.kernel.org
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent b5c3c1b3

arch/x86/kvm/vmx/nested.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -4799,8 +4799,10 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
		instr_info, true, len, &gva))
		return 1;
		/* _system ok, nested_vmx_check_permission has verified cpl=0 */
		if (kvm_write_guest_virt_system(vcpu, gva, &value, len, &e))
		if (kvm_write_guest_virt_system(vcpu, gva, &value, len, &e)) {
		kvm_inject_page_fault(vcpu, &e);
		return 1;
		}
		}

		return nested_vmx_succeed(vcpu);

Admin message