Commit 4c4d563b authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini
Browse files

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: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ca3f257a

arch/x86/kvm/vmx.c

+7 −3
Original line number Diff line number Diff line
@@ -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))



		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;

}