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

Commit 2e050f00 authored by Jianchao Wang's avatar Jianchao Wang Committed by Christoph Hellwig
Browse files

nvme-rdma: stop admin queue before freeing it 



For any failure after nvme_rdma_start_queue in
nvme_rdma_configure_admin_queue, the admin queue will be freed with the
NVME_RDMA_Q_LIVE flag still set.  Once nvme_rdma_stop_queue is invoked,
that will cause a use-after-free.
BUG: KASAN: use-after-free in rdma_disconnect+0x1f/0xe0 [rdma_cm]

To fix it, call nvme_rdma_stop_queue for all the failed cases after
nvme_rdma_start_queue.

Signed-off-by: default avatarJianchao Wang <jianchao.w.wang@oracle.com>
Suggested-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 72cd4cc2

drivers/nvme/host/rdma.c

+6 −4
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, 
	if (error) {

		dev_err(ctrl->ctrl.device,

			"prop_get NVME_REG_CAP failed\n");

		goto out_cleanup_queue;

		goto out_stop_queue;

	}



	ctrl->ctrl.sqsize =
@@ -786,23 +786,25 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, 


	error = nvme_enable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);

	if (error)

		goto out_cleanup_queue;

		goto out_stop_queue;



	ctrl->ctrl.max_hw_sectors =

		(ctrl->max_fr_pages - 1) << (ilog2(SZ_4K) - 9);



	error = nvme_init_identify(&ctrl->ctrl);

	if (error)

		goto out_cleanup_queue;

		goto out_stop_queue;



	error = nvme_rdma_alloc_qe(ctrl->queues[0].device->dev,

			&ctrl->async_event_sqe, sizeof(struct nvme_command),

			DMA_TO_DEVICE);

	if (error)

		goto out_cleanup_queue;

		goto out_stop_queue;



	return 0;



out_stop_queue:

	nvme_rdma_stop_queue(&ctrl->queues[0]);

out_cleanup_queue:

	if (new)

		blk_cleanup_queue(ctrl->ctrl.admin_q);