| From 5ae7e1b06e6d3b0c931817a1ee99b1b3bd386ded Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 28 Dec 2019 14:25:24 +0800 |
| Subject: KVM: nVMX: vmread should not set rflags to specify success in case of |
| #PF |
| |
| From: Miaohe Lin <linmiaohe@huawei.com> |
| |
| [ Upstream commit a4d956b9390418623ae5d07933e2679c68b6f83c ] |
| |
| 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: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kvm/vmx.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c |
| index fa2abed1a14da..2660c01eadaeb 100644 |
| --- a/arch/x86/kvm/vmx.c |
| +++ b/arch/x86/kvm/vmx.c |
| @@ -8793,8 +8793,10 @@ static int handle_vmread(struct kvm_vcpu *vcpu) |
| /* _system ok, nested_vmx_check_permission has verified cpl=0 */ |
| if (kvm_write_guest_virt_system(vcpu, gva, &field_value, |
| (is_long_mode(vcpu) ? 8 : 4), |
| - &e)) |
| + &e)) { |
| kvm_inject_page_fault(vcpu, &e); |
| + return 1; |
| + } |
| } |
| |
| nested_vmx_succeed(vcpu); |
| -- |
| 2.20.1 |
| |
