]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: mvsas: Fix use-after-free bugs in mvs_work_queue
authorDuoming Zhou <duoming@zju.edu.cn>
Sat, 20 Sep 2025 13:42:01 +0000 (21:42 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 19 Oct 2025 14:23:08 +0000 (16:23 +0200)
[ Upstream commit 60cd16a3b7439ccb699d0bf533799eeb894fd217 ]

During the detaching of Marvell's SAS/SATA controller, the original code
calls cancel_delayed_work() in mvs_free() to cancel the delayed work
item mwq->work_q. However, if mwq->work_q is already running, the
cancel_delayed_work() may fail to cancel it. This can lead to
use-after-free scenarios where mvs_free() frees the mvs_info while
mvs_work_queue() is still executing and attempts to access the
already-freed mvs_info.

A typical race condition is illustrated below:

CPU 0 (remove)            | CPU 1 (delayed work callback)
mvs_pci_remove()          |
  mvs_free()              | mvs_work_queue()
    cancel_delayed_work() |
      kfree(mvi)          |
                          |   mvi-> // UAF

Replace cancel_delayed_work() with cancel_delayed_work_sync() to ensure
that the delayed work item is properly canceled and any executing
delayed work item completes before the mvs_info is deallocated.

This bug was found by static analysis.

Fixes: 20b09c2992fe ("[SCSI] mvsas: add support for 94xx; layout change; bug fixes")
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/mvsas/mv_init.c

index cfe84473a515389f0e88b19b04d390827bec7cb3..b500c343cad755724d2ec4a2c76e39eb3b591a00 100644 (file)
@@ -141,7 +141,7 @@ static void mvs_free(struct mvs_info *mvi)
        if (mvi->shost)
                scsi_host_put(mvi->shost);
        list_for_each_entry(mwq, &mvi->wq_list, entry)
-               cancel_delayed_work(&mwq->work_q);
+               cancel_delayed_work_sync(&mwq->work_q);
        kfree(mvi->rsvd_tags);
        kfree(mvi);
 }