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>
This commit is contained in:
parent
ca3f257ae5
commit
4c4d563b49
|
@ -5137,10 +5137,14 @@ static int handle_dr(struct kvm_vcpu *vcpu)
|
||||||
reg = DEBUG_REG_ACCESS_REG(exit_qualification);
|
reg = DEBUG_REG_ACCESS_REG(exit_qualification);
|
||||||
if (exit_qualification & TYPE_MOV_FROM_DR) {
|
if (exit_qualification & TYPE_MOV_FROM_DR) {
|
||||||
unsigned long val;
|
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
|
} 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);
|
skip_emulated_instruction(vcpu);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue