From: Michal Luczaj <mhal@rbox.co>
Date: Mon, 27 Mar 2023 17:54:57 +0000 (+0200)
Subject: KVM: Don't kfree(NULL) on kzalloc() failure in kvm_assign_ioeventfd_idx()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70b0bc4c0a05cb68ffeeaba8c8340896b5ff6fd7;p=linux.git

KVM: Don't kfree(NULL) on kzalloc() failure in kvm_assign_ioeventfd_idx()

On kzalloc() failure, taking the `goto fail` path leads to kfree(NULL).
Such no-op has no use. Move it out.

Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230327175457.735903-1-mhal@rbox.co
Signed-off-by: Sean Christopherson <seanjc@google.com>
---

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index b0af834ffa950..7c42441425cf9 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -889,9 +889,9 @@ static int kvm_assign_ioeventfd_idx(struct kvm *kvm,
 
 unlock_fail:
 	mutex_unlock(&kvm->slots_lock);
+	kfree(p);
 
 fail:
-	kfree(p);
 	eventfd_ctx_put(eventfd);
 
 	return ret;