]> www.infradead.org Git - users/jedix/linux-maple.git/commit
scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
authorChenyuan Yang <chenyuan0y@gmail.com>
Thu, 10 Apr 2025 00:13:20 +0000 (19:13 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 12 Apr 2025 01:33:30 +0000 (21:33 -0400)
commit4c324085062919d4e21c69e5e78456dcec0052fe
treea1e6bb07bb079e2d7bb024847a66a9884969aad0
parenta1af6f1a1433348c93f0b3a7a64f20a0a898ef78
scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()

A race can occur between the MCQ completion path and the abort handler:
once a request completes, __blk_mq_free_request() sets rq->mq_hctx to
NULL, meaning the subsequent ufshcd_mcq_req_to_hwq() call in
ufshcd_mcq_abort() can return a NULL pointer. If this NULL pointer is
dereferenced, the kernel will crash.

Add a NULL check for the returned hwq pointer. If hwq is NULL, log an
error and return FAILED, preventing a potential NULL-pointer
dereference.  As suggested by Bart, the ufshcd_cmd_inflight() check is
removed.

This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix
ufshcd_abort_one racing issue").

This is found by our static analysis tool KNighter.

Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
Link: https://lore.kernel.org/r/20250410001320.2219341-1-chenyuan0y@gmail.com
Fixes: f1304d442077 ("scsi: ufs: mcq: Added ufshcd_mcq_abort()")
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufs-mcq.c