lkml.org 
[lkml]   [2019]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 066/115] nvme: fix srcu locking on error return in nvme_get_ns_from_disk
    Date
    [ 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: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Keith Busch <keith.busch@intel.com>
    Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/core.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index 8782d86a8ca3..e29c395f44d2 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -1362,9 +1362,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;
    @@ -1411,9 +1416,9 @@ 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
    - ret = nvme_ns_ioctl(ns, cmd, arg);
    + return -EWOULDBLOCK;
    +
    + ret = nvme_ns_ioctl(ns, cmd, arg);
    nvme_put_ns_from_disk(head, srcu_idx);
    return ret;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-06-17 23:36    [W:4.039 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site