lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 30 May 2022 09:23:51 -0400 From: Sasha Levin <sashal@...nel.org> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org Cc: "Smith, Kyle Miller (Nimble Kernel)" <kyles@....com>, Chaitanya Kulkarni <kch@...dia.com>, Hannes Reinecke <hare@...e.de>, Christoph Hellwig <hch@....de>, Sasha Levin <sashal@...nel.org>, kbusch@...nel.org, axboe@...com, sagi@...mberg.me, linux-nvme@...ts.infradead.org Subject: [PATCH AUTOSEL 5.18 126/159] nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags From: "Smith, Kyle Miller (Nimble Kernel)" <kyles@....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@....com> Reviewed-by: Chaitanya Kulkarni <kch@...dia.com> Reviewed-by: Hannes Reinecke <hare@...e.de> Signed-off-by: Christoph Hellwig <hch@....de> Signed-off-by: Sasha Levin <sashal@...nel.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
Powered by blists - more mailing lists