From: Sagi Grimberg sagi@grimberg.me

mainline inclusion from mainline-v5.17-rc3 commit b6bb1722f34bbdbabed27acdceaf585d300c5fd2 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IADGNY?from=project-issue CVE: CVE-2022-48788

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

--------------------------------

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 sagi@grimberg.me Signed-off-by: He Yujie coka.heyujie@huawei.com --- drivers/nvme/host/rdma.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index d86a50f09646..574c5e0182cf 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1045,6 +1045,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) struct nvme_rdma_ctrl, err_work);

nvme_stop_keep_alive(&ctrl->ctrl); + flush_work(&ctrl->ctrl.async_event_work); nvme_rdma_teardown_io_queues(ctrl, false); nvme_start_queues(&ctrl->ctrl); nvme_rdma_teardown_admin_queue(ctrl, false);