KVM: Fix mov cr3 #GP at wrong instruction

On Intel, we call skip_emulated_instruction() even if we injected a #GP,
resulting in the #GP pointing at the wrong address.

Fix by injecting the exception and skipping the instruction at the same place,
so we can do just one or the other.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 6d1616d47c54..f7a6fdcf8ef3 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1963,7 +1963,7 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
                 svm->vmcb->save.cr3 = hsave->save.cr3;
                 svm->vcpu.arch.cr3 = hsave->save.cr3;
         } else {
-                kvm_set_cr3(&svm->vcpu, hsave->save.cr3);
+                (void)kvm_set_cr3(&svm->vcpu, hsave->save.cr3);
         }
         kvm_register_write(&svm->vcpu, VCPU_REGS_RAX, hsave->save.rax);
         kvm_register_write(&svm->vcpu, VCPU_REGS_RSP, hsave->save.rsp);
@@ -2086,7 +2086,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
                 svm->vmcb->save.cr3 = nested_vmcb->save.cr3;
                 svm->vcpu.arch.cr3 = nested_vmcb->save.cr3;
         } else
-                kvm_set_cr3(&svm->vcpu, nested_vmcb->save.cr3);
+                (void)kvm_set_cr3(&svm->vcpu, nested_vmcb->save.cr3);
 
         /* Guest paging mode is active - reset mmu */
         kvm_mmu_reset_context(&svm->vcpu);