summaryrefslogtreecommitdiff
path: root/drivers/nvme
diff options
context:
space:
mode:
authorChaitanya Kulkarni <kch@nvidia.com>2023-06-02 08:37:13 +0300
committerKeith Busch <kbusch@kernel.org>2023-06-12 20:36:59 +0300
commit900095bfbbf6623fbfa9e5ceb3982f293b6f3275 (patch)
treef5e023fc9eb7e307fb0d7c54866ca0b1eb028c90 /drivers/nvme
parentbdbfcd5f6caa46e1ddbfd60cbf694d192b37805a (diff)
downloadlinux-900095bfbbf6623fbfa9e5ceb3982f293b6f3275.tar.xz
nvme-fabrics: error out to unlock the mutex
Currently, in the nvmf_host_add() function, if the nvmf_host_alloc() call failed to allocate memory for the host, the code would directly return -ENOMEM without unlocking the nvmf_hosts_mutex. This could lead to potential issues with mutex synchronization. Fix that error handling mechanism by jumping to the out_unlock label when nvmf_host_alloc() fails. This ensures that the mutex is unlocked before returning the error code. The updated code enhances avoids possible deadlocks. Fixes: f0cebf82004d ("nvme-fabrics: prevent overriding of existing host") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Julia Lawall <julia.lawall@inria.fr> Closes: https://lore.kernel.org/r/202306020909.MTUEBeIa-lkp@intel.com/ Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Julia Lawall <julia.lawall@inria.fr> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/fabrics.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index b1fa27b60917..c4345d1d98aa 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -92,8 +92,10 @@ static struct nvmf_host *nvmf_host_add(const char *hostnqn, uuid_t *id)
}
host = nvmf_host_alloc(hostnqn, id);
- if (!host)
- return ERR_PTR(-ENOMEM);
+ if (!host) {
+ host = ERR_PTR(-ENOMEM);
+ goto out_unlock;
+ }
list_add_tail(&host->list, &nvmf_hosts);
out_unlock: