Commit 992a773c authored Nov 28, 2018 by Prabhath Sajeepa Committed by Greg Kroah-Hartman Dec 17, 2018

nvme-rdma: fix double freeing of async event data



[ Upstream commit 6344d02dc8f886b6bbcd922ae1a17e4a41500f2d ]

Some error paths in configuration of admin queue free data buffer
associated with async request SQE without resetting the data buffer
pointer to NULL, This buffer is also freed up again if the controller
is shutdown or reset.

Signed-off-by: Prabhath Sajeepa <psajeepa@purestorage.com>
Reviewed-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 5893e48f

drivers/nvme/host/rdma.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@ static int nvme_rdma_alloc_qe(struct ib_device ibdev, struct nvme_rdma_qe qe,
		qe->dma = ib_dma_map_single(ibdev, qe->data, capsule_size, dir);
		if (ib_dma_mapping_error(ibdev, qe->dma)) {
		kfree(qe->data);
		qe->data = NULL;
		return -ENOMEM;
		}

		@@ -816,6 +817,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
		out_free_async_qe:
		nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
		sizeof(struct nvme_command), DMA_TO_DEVICE);
		ctrl->async_event_sqe.data = NULL;
		out_free_queue:
		nvme_rdma_free_queue(&ctrl->queues[0]);
		return error;