Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a425896 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-tcp: fix a NULL deref when an admin connect times out 



If we timeout the admin startup sequence we might not yet have
an I/O tagset allocated which causes the teardown sequence to crash.
Make nvme_tcp_teardown_io_queues safe by not iterating inflight tags
if the tagset wasn't allocated.

Fixes: 39d57757 ("nvme-tcp: fix timeout handler")
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 569b3d3d

drivers/nvme/host/tcp.c

+6 −2
Original line number Diff line number Diff line
@@ -1710,7 +1710,9 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl, 
{

	blk_mq_quiesce_queue(ctrl->admin_q);

	nvme_tcp_stop_queue(ctrl, 0);

	blk_mq_tagset_busy_iter(ctrl->admin_tagset, nvme_cancel_request, ctrl);

	if (ctrl->admin_tagset)

		blk_mq_tagset_busy_iter(ctrl->admin_tagset,

			nvme_cancel_request, ctrl);

	blk_mq_unquiesce_queue(ctrl->admin_q);

	nvme_tcp_destroy_admin_queue(ctrl, remove);

}
@@ -1722,7 +1724,9 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, 
		return;

	nvme_stop_queues(ctrl);

	nvme_tcp_stop_io_queues(ctrl);

	blk_mq_tagset_busy_iter(ctrl->tagset, nvme_cancel_request, ctrl);

	if (ctrl->tagset)

		blk_mq_tagset_busy_iter(ctrl->tagset,

			nvme_cancel_request, ctrl);

	if (remove)

		nvme_start_queues(ctrl);

	nvme_tcp_destroy_io_queues(ctrl, remove);