lkml.org 
[lkml]   [2020]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 357/367] KVM: nVMX: vmread should not set rflags to specify success in case of #PF
    Date
    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/nested.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
    index 4aea7d304bebd..5bfa8228f0c74 100644
    --- a/arch/x86/kvm/vmx/nested.c
    +++ b/arch/x86/kvm/vmx/nested.c
    @@ -4807,8 +4807,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.20.1


    \
     
     \ /
      Last update: 2020-02-10 13:54    [W:4.155 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site