Commit 05402f64 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

x86: KVM: svm: don't pretend to advance RIP in case wrmsr_interception() results in #GP 



svm->next_rip is only used by skip_emulated_instruction() and in case
kvm_set_msr() fails we rightfully don't do that. Move svm->next_rip
advancement to 'else' branch to avoid creating false impression that
it's always advanced (and make it look like rdmsr_interception()).

This is a preparatory change to removing hardcoded RIP advancement
from instruction intercepts, no functional change.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 016cd759

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -4444,13 +4444,13 @@ static int wrmsr_interception(struct vcpu_svm *svm) 
	msr.index = ecx;

	msr.host_initiated = false;



	svm->next_rip = kvm_rip_read(&svm->vcpu) + 2;

	if (kvm_set_msr(&svm->vcpu, &msr)) {

		trace_kvm_msr_write_ex(ecx, data);

		kvm_inject_gp(&svm->vcpu, 0);

		return 1;

	} else {

		trace_kvm_msr_write(ecx, data);

		svm->next_rip = kvm_rip_read(&svm->vcpu) + 2;

		return kvm_skip_emulated_instruction(&svm->vcpu);

	}

}