Skip to contentSkip to conversation

scsi: ufs: Fix illegal address reading in upiu event trace

PATCH In review Jonathan Hsu 2 participants 2 messages Sep 23, 2021 – Sep 24, 2021 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs: Fix illegal address reading in upiu event trace

Fix incorrect index for UTMRD reference in ufshcd_add_tm_upiu_trace().

Change-Id I9acab6f3223f96d864948bb5670759d58cf92ad6
---
 drivers/scsi/ufs/ufshcd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +1 -2
index 3841ab49f556..36aa27cdc2ab 100644
@@ -319,8 +319,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba,
 static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
 				     enum ufs_trace_str_t str_t)
 {
-	int off = (int)tag - hba->nutrs;
-	struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off];
+	struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[tag];
 
 	if (!trace_ufshcd_upiu_enabled())
 		return;
Signature · 1 line
2.18.0
#1 lore raw
Quoted 13 lines · Jonathan Hsu

Fix incorrect index for UTMRD reference in ufshcd_add_tm_upiu_trace().

Change-Id I9acab6f3223f96d864948bb5670759d58cf92ad6
---
  drivers/scsi/ufs/ufshcd.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -0
index 3841ab49f556..36aa27cdc2ab 100644

drivers/scsi/ufs/ufshcd.c static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, · line 325

Quoted 9 lines
drivers/scsi/ufs/ufshcd.c +1 -2
@@ -319,8 +319,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba,
  static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
  				     enum ufs_trace_str_t str_t)
  {
-	int off = (int)tag - hba->nutrs;
-	struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off];
+	struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[tag];
 
  	if (!trace_ufshcd_upiu_enabled())
  		return;

Please add a Fixes: tag. Is the above patch perhaps a fix for the following
commit: 4b42d557a8ad ("scsi: ufs: core: Fix wrong Task Tag used in task management request UPIUs")?

Thanks,

Bart.