OSDN Git Service

x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed
authorVitaly Kuznetsov <vkuznets@redhat.com>
Wed, 9 Jan 2019 17:22:56 +0000 (18:22 +0100)
committerRadim Krčmář <rkrcmar@redhat.com>
Fri, 11 Jan 2019 17:41:53 +0000 (18:41 +0100)
commit826c1362e79abcd36f99092acd083b5a2d576676
tree01d931fba8a4c188e972f7956d4bec2acff78a4c
parentcf1754c2a1d6e92688f7353aa7f598f5ad6d8f78
x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed

Since commit 09abb5e3e5e50 ("KVM: nVMX: call kvm_skip_emulated_instruction
in nested_vmx_{fail,succeed}") nested_vmx_failValid() results in
kvm_skip_emulated_instruction() so doing it again in handle_vmptrld() when
vmptr address is not backed is wrong, we end up advancing RIP twice.

Fixes: fca91f6d60b6e ("kvm: nVMX: Set VM instruction error for VMPTRLD of unbacked page")
Reported-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
arch/x86/kvm/vmx/nested.c