Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6515af9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

nvme: fix srcu locking on error return in nvme_get_ns_from_disk 



[ Upstream commit 100c815cbd56480b3e31518475b04719c363614a ]

If we can't get a namespace don't leak the SRCU lock.  nvme_ioctl was
working around this, but nvme_pr_command wasn't handling this properly.
Just do what callers would usually expect.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c4e97af6

drivers/nvme/host/core.c

+9 −4
Original line number Diff line number Diff line
@@ -1277,9 +1277,14 @@ static struct nvme_ns *nvme_get_ns_from_disk(struct gendisk *disk, 
{

#ifdef CONFIG_NVME_MULTIPATH

	if (disk->fops == &nvme_ns_head_ops) {

		struct nvme_ns *ns;



		*head = disk->private_data;

		*srcu_idx = srcu_read_lock(&(*head)->srcu);

		return nvme_find_path(*head);

		ns = nvme_find_path(*head);

		if (!ns)

			srcu_read_unlock(&(*head)->srcu, *srcu_idx);

		return ns;

	}

#endif

	*head = NULL;
@@ -1326,8 +1331,8 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, 


	ns = nvme_get_ns_from_disk(bdev->bd_disk, &head, &srcu_idx);

	if (unlikely(!ns))

		ret = -EWOULDBLOCK;

	else

		return -EWOULDBLOCK;



	ret = nvme_ns_ioctl(ns, cmd, arg);

	nvme_put_ns_from_disk(head, srcu_idx);

	return ret;