]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nvme: take refcount on transport module
authorNitzan Carmi <nitzanc@mellanox.com>
Thu, 4 Jan 2018 15:56:13 +0000 (17:56 +0200)
committerChristoph Hellwig <hch@lst.de>
Mon, 8 Jan 2018 15:56:57 +0000 (16:56 +0100)
The block device is backed by the transport so we must ensure that the
transport driver will not be removed until all references are released.
Otherwise, we might end up referencing freed memory.

Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Nitzan Carmi <nitzanc@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/core.c

index 609307ca9e4da98c02e3f9e7c7dbb9023dad612e..c8bcfe64e976ef13e85f935cd9273e439c6498a5 100644 (file)
@@ -1228,16 +1228,27 @@ static int nvme_open(struct block_device *bdev, fmode_t mode)
 #ifdef CONFIG_NVME_MULTIPATH
        /* should never be called due to GENHD_FL_HIDDEN */
        if (WARN_ON_ONCE(ns->head->disk))
-               return -ENXIO;
+               goto fail;
 #endif
        if (!kref_get_unless_zero(&ns->kref))
-               return -ENXIO;
+               goto fail;
+       if (!try_module_get(ns->ctrl->ops->module))
+               goto fail_put_ns;
+
        return 0;
+
+fail_put_ns:
+       nvme_put_ns(ns);
+fail:
+       return -ENXIO;
 }
 
 static void nvme_release(struct gendisk *disk, fmode_t mode)
 {
-       nvme_put_ns(disk->private_data);
+       struct nvme_ns *ns = disk->private_data;
+
+       module_put(ns->ctrl->ops->module);
+       nvme_put_ns(ns);
 }
 
 static int nvme_getgeo(struct block_device *bdev, struct hd_geometry *geo)