Commit e6a82199 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: svm: drop explicit return value of kvm_vcpu_map 



if kvm_vcpu_map returns non zero value, error path should be triggered
regardless of the exact returned error value.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20221025124741.228045-21-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8bcda1de

arch/x86/kvm/svm/svm.c

+3 −4
Original line number Diff line number Diff line
@@ -4437,8 +4437,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) 
	 * that, see svm_prepare_switch_to_guest()) which must be

	 * preserved.

	 */

	if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr),

			 &map_save) == -EINVAL)

	if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr), &map_save))

		return 1;



	BUILD_BUG_ON(offsetof(struct vmcb, save) != 0x400);
@@ -4475,11 +4474,11 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) 
		return 1;



	vmcb12_gpa = GET_SMSTATE(u64, smstate, 0x7ee0);

	if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map) == -EINVAL)

	if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map))

		return 1;



	ret = 1;

	if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr), &map_save) == -EINVAL)

	if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr), &map_save))

		goto unmap_map;



	if (svm_allocate_nested(svm))