Commit bfb7789b authored Mar 20, 2022 by Xiaomeng Tong Committed by Martin K. Petersen Apr 06, 2022

scsi: ufs: ufshpb: Fix a NULL check on list iterator

The list iterator is always non-NULL so the check 'if (!rgn)' is always
false and the dev_err() is never called. Move the check outside the loop
and determine if 'victim_rgn' is NULL, to fix this bug.

Link: https://lore.kernel.org/r/20220320150733.21824-1-xiam0nd.tong@gmail.com

Fixes: 4b5f4907 ("scsi: ufs: ufshpb: L2P map management for HPB read")
Reviewed-by: Daejun Park <daejun7.park@samsung.com>
Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 03252259

drivers/scsi/ufs/ufshpb.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -867,12 +867,6 @@ static struct ufshpb_region ufshpb_victim_lru_info(struct ufshpb_lu hpb)
		struct ufshpb_region rgn, victim_rgn = NULL;

		list_for_each_entry(rgn, &lru_info->lh_lru_rgn, list_lru_rgn) {
		if (!rgn) {
		dev_err(&hpb->sdev_ufs_lu->sdev_dev,
		"%s: no region allocated\n",
		__func__);
		return NULL;
		}
		if (ufshpb_check_srgns_issue_state(hpb, rgn))
		continue;

		@@ -888,6 +882,11 @@ static struct ufshpb_region ufshpb_victim_lru_info(struct ufshpb_lu hpb)
		break;
		}

		if (!victim_rgn)
		dev_err(&hpb->sdev_ufs_lu->sdev_dev,
		"%s: no region allocated\n",
		__func__);

		return victim_rgn;
		}