| From a1401293b45df097632a4064159bb1116fbc59d0 Mon Sep 17 00:00:00 2001 |
| From: Miaohe Lin <linmiaohe@huawei.com> |
| Date: Sat, 28 Dec 2019 14:25:24 +0800 |
| Subject: [PATCH] KVM: nVMX: vmread should not set rflags to specify success in |
| case of #PF |
| |
| commit a4d956b9390418623ae5d07933e2679c68b6f83c upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c |
| index 5e5104697fa3..5811a0bba0d7 100644 |
| --- a/arch/x86/kvm/vmx/nested.c |
| +++ b/arch/x86/kvm/vmx/nested.c |
| @@ -4462,8 +4462,10 @@ static int handle_vmread(struct kvm_vcpu *vcpu) |
| vmx_instruction_info, true, len, &gva)) |
| return 1; |
| /* _system ok, nested_vmx_check_permission has verified cpl=0 */ |
| - if (kvm_write_guest_virt_system(vcpu, gva, &field_value, len, &e)) |
| + if (kvm_write_guest_virt_system(vcpu, gva, &field_value, len, &e)) { |
| kvm_inject_page_fault(vcpu, &e); |
| + return 1; |
| + } |
| } |
| |
| return nested_vmx_succeed(vcpu); |
| -- |
| 2.7.4 |
| |
