diff options
| author | Jan Kiszka | 2013-12-18 19:16:24 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2013-12-20 19:20:39 +0100 |
| commit | 4c4d563b49830a66537c3f51070dad74d7a81d3a (patch) | |
| tree | 85264314471e0e420e0226010044842191e20a79 /arch/x86/kvm/vmx.c | |
| parent | KVM: nVMX: Support direct APIC access from L2 (diff) | |
| download | kernel-qcow2-linux-4c4d563b49830a66537c3f51070dad74d7a81d3a.tar.gz kernel-qcow2-linux-4c4d563b49830a66537c3f51070dad74d7a81d3a.tar.xz kernel-qcow2-linux-4c4d563b49830a66537c3f51070dad74d7a81d3a.zip | |
KVM: VMX: Do not skip the instruction if handle_dr injects a fault
If kvm_get_dr or kvm_set_dr reports that it raised a fault, we must not
advance the instruction pointer. Otherwise the exception will hit the
wrong instruction.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 31eb5776d854..9cc54842ae14 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5137,10 +5137,14 @@ static int handle_dr(struct kvm_vcpu *vcpu) reg = DEBUG_REG_ACCESS_REG(exit_qualification); if (exit_qualification & TYPE_MOV_FROM_DR) { unsigned long val; - if (!kvm_get_dr(vcpu, dr, &val)) - kvm_register_write(vcpu, reg, val); + + if (kvm_get_dr(vcpu, dr, &val)) + return 1; + kvm_register_write(vcpu, reg, val); } else - kvm_set_dr(vcpu, dr, vcpu->arch.regs[reg]); + if (kvm_set_dr(vcpu, dr, vcpu->arch.regs[reg])) + return 1; + skip_emulated_instruction(vcpu); return 1; } |