mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags
[ Upstream commit da42761181
]
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>
This commit is contained in:
parent
d96ed05506
commit
9e649471b3
1 changed files with 1 additions and 0 deletions
|
@ -1424,6 +1424,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
|
||||||
dev->ctrl.admin_q = blk_mq_init_queue(&dev->admin_tagset);
|
dev->ctrl.admin_q = blk_mq_init_queue(&dev->admin_tagset);
|
||||||
if (IS_ERR(dev->ctrl.admin_q)) {
|
if (IS_ERR(dev->ctrl.admin_q)) {
|
||||||
blk_mq_free_tag_set(&dev->admin_tagset);
|
blk_mq_free_tag_set(&dev->admin_tagset);
|
||||||
|
dev->ctrl.admin_q = NULL;
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
if (!blk_get_queue(dev->ctrl.admin_q)) {
|
if (!blk_get_queue(dev->ctrl.admin_q)) {
|
||||||
|
|
Loading…
Reference in a new issue