Commit a061985b authored Aug 27, 2019 by Dan Carpenter Committed by Paolo Bonzini Sep 11, 2019

x86: KVM: svm: Fix a check in nested_svm_vmrun()



We refactored this code a bit and accidentally deleted the "-" character
from "-EINVAL".  The kvm_vcpu_map() function never returns positive
EINVAL.

Fixes: c8e16b78 ("x86: KVM: svm: eliminate hardcoded RIP advancement from vmrun_interception()")
Cc: stable@vger.kernel.org
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 7396d337

arch/x86/kvm/svm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3598,7 +3598,7 @@ static int nested_svm_vmrun(struct vcpu_svm *svm)
		vmcb_gpa = svm->vmcb->save.rax;

		ret = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map);
		if (ret == EINVAL) {
		if (ret == -EINVAL) {
		kvm_inject_gp(&svm->vcpu, 0);
		return 1;
		} else if (ret) {

Admin message