Skip to content

Commit b6bb172

Browse files
sagigrimbergChristoph Hellwig
authored andcommitted
nvme-rdma: fix possible use-after-free in transport error_recovery work
While nvme_rdma_submit_async_event_work is checking the ctrl and queue state before preparing the AER command and scheduling io_work, in order to fully prevent a race where this check is not reliable the error recovery work must flush async_event_work before continuing to destroy the admin queue after setting the ctrl state to RESETTING such that there is no race .submit_async_event and the error recovery handler itself changing the ctrl state. Signed-off-by: Sagi Grimberg <[email protected]>
1 parent ff9fc7e commit b6bb172

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/nvme/host/rdma.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
12001200
struct nvme_rdma_ctrl, err_work);
12011201

12021202
nvme_stop_keep_alive(&ctrl->ctrl);
1203+
flush_work(&ctrl->ctrl.async_event_work);
12031204
nvme_rdma_teardown_io_queues(ctrl, false);
12041205
nvme_start_queues(&ctrl->ctrl);
12051206
nvme_rdma_teardown_admin_queue(ctrl, false);

0 commit comments

Comments
 (0)