nvme: move stopping keep-alive into nvme_uninit_ctrl()
PATCH v2 1/1 nvme: move stopping keep-alive into nvme_uninit_ctrl()
Commit 4733b65d82bd ("nvme: start keep-alive after admin queue setup") moves starting keep-alive from nvme_start_ctrl() into nvme_init_ctrl_finish(), but don't move stopping keep-alive into nvme_uninit_ctrl(), so keep-alive work can be started and keep pending after failing to start controller, finally use-after-free is triggered if nvme host driver is unloaded.
This patch fixes kernel panic when running nvme/004 in case that connection failure is triggered, by moving stopping keep-alive into nvme_uninit_ctrl().
This way is reasonable because keep-alive is now started in nvme_init_ctrl_finish().
---
V2:
- fix "Fixes" tag
drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -4612,7 +4612,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) {nvme_mpath_stop (ctrl);nvme_auth_stop (ctrl); -nvme_stop_keep_alive (ctrl);nvme_stop_failfast_work (ctrl);flush_work (&ctrl->async_event_work);cancel_work_sync (&ctrl->fw_act_work);
@@ -4648,6 +4647,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl);void nvme_uninit_ctrl (struct nvme_ctrl *ctrl) { +nvme_stop_keep_alive (ctrl);nvme_hwmon_exit (ctrl);nvme_fault_inject_fini (&ctrl->fault_inject);dev_pm_qos_hide_latency_tolerance (ctrl->device);
Signature · 1 line
2.45.2
Quoted 20 lines · Ming Lei
Commit
4733b65d82bd("nvme: start keep-alive after admin queue setup") moves starting keep-alive fromnvme_start_ctrl()intonvme_init_ctrl_finish(), but don't move stopping keep-alive intonvme_uninit_ctrl(), so keep-alive work can be started and keep pending after failing to start controller, finally use-after-free is triggered if nvme host driver is unloaded.This patch fixes kernel panic when running nvme/004 in case that connection failure is triggered, by moving stopping keep-alive into
nvme_uninit_ctrl().This way is reasonable because keep-alive is now started in
nvme_init_ctrl_finish().Fixes 3af755a46881 ("nvme: move nvme_stop_keep_alive() back to original position")Cc Hannes Reinecke <[email protected]>Cc Mark O'Donovan <[email protected]>Reported-by Changhui Zhong <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Reviewed-by Sagi Grimberg <[email protected]>Signed-off-by Ming Lei <[email protected]>
Quoted 7 lines
---
V2:
- fix "Fixes" tagdrivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
Thanks, applied to nvme-6.11.