Skip to content

Commit 0fa0f99

Browse files
sagigrimbergChristoph Hellwig
authored andcommitted
nvme: fix a possible use-after-free in controller reset during load
Unlike .queue_rq, in .submit_async_event drivers may not check the ctrl readiness for AER submission. This may lead to a use-after-free condition that was observed with nvme-tcp. The race condition may happen in the following scenario: 1. driver executes its reset_ctrl_work 2. -> nvme_stop_ctrl - flushes ctrl async_event_work 3. ctrl sends AEN which is received by the host, which in turn schedules AEN handling 4. teardown admin queue (which releases the queue socket) 5. AEN processed, submits another AER, calling the driver to submit 6. driver attempts to send the cmd ==> use-after-free In order to fix that, add ctrl state check to validate the ctrl is actually able to accept the AER submission. This addresses the above race in controller resets because the driver during teardown should: 1. change ctrl state to RESETTING 2. flush async_event_work (as well as other async work elements) So after 1,2, any other AER command will find the ctrl state to be RESETTING and bail out without submitting the AER. Signed-off-by: Sagi Grimberg <[email protected]>
1 parent b879f91 commit 0fa0f99

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/nvme/host/core.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4253,7 +4253,14 @@ static void nvme_async_event_work(struct work_struct *work)
42534253
container_of(work, struct nvme_ctrl, async_event_work);
42544254

42554255
nvme_aen_uevent(ctrl);
4256-
ctrl->ops->submit_async_event(ctrl);
4256+
4257+
/*
4258+
* The transport drivers must guarantee AER submission here is safe by
4259+
* flushing ctrl async_event_work after changing the controller state
4260+
* from LIVE and before freeing the admin queue.
4261+
*/
4262+
if (ctrl->state == NVME_CTRL_LIVE)
4263+
ctrl->ops->submit_async_event(ctrl);
42574264
}
42584265

42594266
static bool nvme_ctrl_pp_status(struct nvme_ctrl *ctrl)

0 commit comments

Comments
 (0)