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
This commit is contained in:
commit
49f1c61071
|
@ -732,8 +732,11 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
|
||||||
blk_cleanup_queue(ctrl->ctrl.admin_q);
|
blk_cleanup_queue(ctrl->ctrl.admin_q);
|
||||||
nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
|
nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
|
||||||
}
|
}
|
||||||
nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
|
if (ctrl->async_event_sqe.data) {
|
||||||
sizeof(struct nvme_command), DMA_TO_DEVICE);
|
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]);
|
nvme_rdma_free_queue(&ctrl->queues[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue