summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>2020-10-06 16:36:47 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-14 10:31:22 +0200
commitb6df5afc3d81e34d32f0b092d59b7fe8915d824b (patch)
tree88ea4a2beb69da35a94fe0afd47b0d042779ad74
parent13e7ffa315ad3ab69ccfa19fc9a6c08425728728 (diff)
downloadlinux-stable-b6df5afc3d81e34d32f0b092d59b7fe8915d824b.tar.gz
linux-stable-b6df5afc3d81e34d32f0b092d59b7fe8915d824b.tar.bz2
linux-stable-b6df5afc3d81e34d32f0b092d59b7fe8915d824b.zip
nvme-core: put ctrl ref when module ref get fail
commit 4bab69093044ca81f394bd0780be1b71c5a4d308 upstream. When try_module_get() fails in the nvme_dev_open() it returns without releasing the ctrl reference which was taken earlier. Put the ctrl reference which is taken before calling the try_module_get() in the error return code path. Fixes: 52a3974feb1a "nvme-core: get/put ctrl and transport module in nvme_dev_open/release()" Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/nvme/host/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 9ea3d8e61100..b633ea40430e 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2606,8 +2606,10 @@ static int nvme_dev_open(struct inode *inode, struct file *file)
}
nvme_get_ctrl(ctrl);
- if (!try_module_get(ctrl->ops->module))
+ if (!try_module_get(ctrl->ops->module)) {
+ nvme_put_ctrl(ctrl);
return -EINVAL;
+ }
file->private_data = ctrl;
return 0;