Skip to content

Commit ff9fc7e

Browse files
sagigrimbergChristoph Hellwig
authored andcommitted
nvme-tcp: fix possible use-after-free in transport error_recovery work
While nvme_tcp_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. Tested-by: Chris Leech <[email protected]> Signed-off-by: Sagi Grimberg <[email protected]>
1 parent 0fa0f99 commit ff9fc7e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/nvme/host/tcp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2096,6 +2096,7 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work)
20962096
struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl;
20972097

20982098
nvme_stop_keep_alive(ctrl);
2099+
flush_work(&ctrl->async_event_work);
20992100
nvme_tcp_teardown_io_queues(ctrl, false);
21002101
/* unquiesce to fail fast pending requests */
21012102
nvme_start_queues(ctrl);

0 commit comments

Comments
 (0)