History

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

Jens Axboe committed 8 years ago

Commit 49f1c612 parents fad2d4e 682630f1 file · +5 −2Browse files

Unified · Split

drivers/nvme/host/rdma.c+5−2
@@ -732,8 +732,11 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, · 731 unmodified lines
732732 blk_cleanup_queue(ctrl->ctrl.admin_q);
733733 nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
734734 }
735− nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
736− sizeof(struct nvme_command), DMA_TO_DEVICE);
735+ if (ctrl->async_event_sqe.data) {
736+ nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
737+ sizeof(struct nvme_command), DMA_TO_DEVICE);
738+ ctrl->async_event_sqe.data = NULL;
739+ }
737740 nvme_rdma_free_queue(&ctrl->queues[0]);
738741 }
739742

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t