lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 175/879] nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags
    Date
    From: Smith, Kyle Miller (Nimble Kernel) <kyles@hpe.com>

    [ Upstream commit da42761181627e9bdc37d18368b827948a583929 ]

    In nvme_alloc_admin_tags, the admin_q can be set to an error (typically
    -ENOMEM) if the blk_mq_init_queue call fails to set up the queue, which
    is checked immediately after the call. However, when we return the error
    message up the stack, to nvme_reset_work the error takes us to
    nvme_remove_dead_ctrl()
    nvme_dev_disable()
    nvme_suspend_queue(&dev->queues[0]).

    Here, we only check that the admin_q is non-NULL, rather than not
    an error or NULL, and begin quiescing a queue that never existed, leading
    to bad / NULL pointer dereference.

    Signed-off-by: Kyle Smith <kyles@hpe.com>
    Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
    Reviewed-by: Hannes Reinecke <hare@suse.de>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/pci.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
    index 3aacf1c0d5a5..17aeb7d5c485 100644
    --- a/drivers/nvme/host/pci.c
    +++ b/drivers/nvme/host/pci.c
    @@ -1775,6 +1775,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
    dev->ctrl.admin_q = blk_mq_init_queue(&dev->admin_tagset);
    if (IS_ERR(dev->ctrl.admin_q)) {
    blk_mq_free_tag_set(&dev->admin_tagset);
    + dev->ctrl.admin_q = NULL;
    return -ENOMEM;
    }
    if (!blk_get_queue(dev->ctrl.admin_q)) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:18    [W:4.031 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site