KVM: x86/mmu: Passing up the error state of mmu_alloc_shadow_roots()

Like Xu · bonzini · commit c6c937d673aa · 2022-03-02T10:55:58.000-05:00
Just like on the optional mmu_alloc_direct_roots() path, once shadow path reaches "r = -EIO" somewhere, the caller needs to know the actual state in order to enter error handling and avoid something worse. Fixes: 4a38162 ("KVM: MMU: load PDPTRs outside mmu_lock") Signed-off-by: Like Xu <likexu@tencent.com> Reviewed-by: Sean Christopherson <seanjc@google.com> Message-Id: <20220301124941.48412-1-likexu@tencent.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
@@ -3565,7 +3565,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
 out_unlock:
 	write_unlock(&vcpu->kvm->mmu_lock);
 
-	return 0;
+	return r;
 }
 
 static int mmu_alloc_special_roots(struct kvm_vcpu *vcpu)

Original file line number	Diff line number	Diff line change
`@@ -3565,7 +3565,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)`
`3565`	`3565`	`out_unlock:`
`3566`	`3566`	`write_unlock(&vcpu->kvm->mmu_lock);`
`3567`	`3567`
`3568`		`- return 0;`
	`3568`	`+ return r;`
`3569`	`3569`	`}`
`3570`	`3570`
`3571`	`3571`	`static int mmu_alloc_special_roots(struct kvm_vcpu *vcpu)`