Commit 49f1c610 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus 

Pull single NVMe fix from Christoph.

* 'nvme-4.18' of git://git.infradead.org/nvme:
  nvme-rdma: fix possible double free of controller async event buffer
parents fad2d4ef 682630f0

drivers/nvme/host/rdma.c

+5 −2
Original line number Diff line number Diff line
@@ -732,8 +732,11 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, 
		blk_cleanup_queue(ctrl->ctrl.admin_q);

		nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);

	}

	if (ctrl->async_event_sqe.data) {

		nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,

				sizeof(struct nvme_command), DMA_TO_DEVICE);

		ctrl->async_event_sqe.data = NULL;

	}

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

}