scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()

[PATCH] scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()

Posted by Chenyuan Yang 8 months, 1 week ago

Add a NULL check for the returned hwq pointer by ufshcd_mcq_req_to_hwq().

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

Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
Fixes: ab248643d3d6 ("scsi: ufs: core: Add error handling for MCQ mode")
---
 drivers/ufs/core/ufshcd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 0534390c2a35..fd39e10c2043 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -5692,6 +5692,8 @@ static void ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba,
 			continue;
 
 		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));
+		if (!hwq)
+			continue;
 
 		if (force_compl) {
 			ufshcd_mcq_compl_all_cqes_lock(hba, hwq);
-- 
2.34.1

Re: [PATCH] scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()

Posted by Bart Van Assche 8 months, 1 week ago

On 4/12/25 12:59 PM, Chenyuan Yang wrote:
> Add a NULL check for the returned hwq pointer by ufshcd_mcq_req_to_hwq().
> 
> This is similar to the fix in commit 74736103fb41
> ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
> 
> Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
> Fixes: ab248643d3d6 ("scsi: ufs: core: Add error handling for MCQ mode")
> ---
>   drivers/ufs/core/ufshcd.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index 0534390c2a35..fd39e10c2043 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -5692,6 +5692,8 @@ static void ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba,
>   			continue;
>   
>   		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));
> +		if (!hwq)
> +			continue;
>   
>   		if (force_compl) {
>   			ufshcd_mcq_compl_all_cqes_lock(hba, hwq);

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [PATCH] scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()

Posted by Peter Wang (王信友) 8 months, 1 week ago

On Sat, 2025-04-12 at 14:59 -0500, Chenyuan Yang wrote:
> 
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> Add a NULL check for the returned hwq pointer by
> ufshcd_mcq_req_to_hwq().
> 
> This is similar to the fix in commit 74736103fb41
> ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
> 
> Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
> Fixes: ab248643d3d6 ("scsi: ufs: core: Add error handling for MCQ
> mode")
> ---
>  drivers/ufs/core/ufshcd.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index 0534390c2a35..fd39e10c2043 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -5692,6 +5692,8 @@ static void
> ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba,
>                         continue;
> 
>                 hwq = ufshcd_mcq_req_to_hwq(hba,
> scsi_cmd_to_rq(cmd));
> +               if (!hwq)
> +                       continue;
> 
>                 if (force_compl) {
>                         ufshcd_mcq_compl_all_cqes_lock(hba, hwq);
> --
> 2.34.1
> 

Reviewed-by: Peter Wang <peter.wang@mediatek.com>