Skip to contentSkip to conversation

scsi/ufs: Fix ufshcd_mcq_sqe_search()

PATCH Applied Bart Van Assche 2 participants 3 messages Apr 10, 2024 – May 7, 2024

Subsystems (2)
lore
Share & tools
lore

Bart Van Assche

author reviewer
#0 lore raw

PATCH 1/1 scsi/ufs: Fix ufshcd_mcq_sqe_search()

Fix the calculation of the utrd pointer. This patch addresses the following Coverity complaint:

CID 1538170: (#1 of 1): Extra sizeof expression (SIZEOF_MISMATCH) suspicious_pointer_arithmetic: Adding sq_head_slot * 32UL /* sizeof (struct utp_transfer_req_desc) */ to pointer hwq->sqe_base_addr of type struct utp_transfer_req_desc * is suspicious because adding an integral value to this pointer automatically scales that value by the size, 32 bytes, of the pointed-to type, struct utp_transfer_req_desc. Most likely, the multiplication by sizeof (struct utp_transfer_req_desc) in this expression is extraneous and should be eliminated.

Cc Bao D. Nguyen <[email protected]>
Cc Stanley Chu <[email protected]>
Cc Can Guo <[email protected]>
Fixes 8d7290348992 ("scsi: ufs: mcq: Add supporting functions for MCQ abort")
---
 drivers/ufs/core/ufs-mcq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/ufs/core/ufs-mcq.c +1 -2
index 768bf87cd80d..005d63ab1f44 100644
@@ -601,8 +601,7 @@ static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba,
 	addr = le64_to_cpu(cmd_desc_base_addr) & CQE_UCD_BA;
 
 	while (sq_head_slot != hwq->sq_tail_slot) {
-		utrd = hwq->sqe_base_addr +
-				sq_head_slot * sizeof(struct utp_transfer_req_desc);
+		utrd = hwq->sqe_base_addr + sq_head_slot;
 		match = le64_to_cpu(utrd->command_desc_base_addr) & CQE_UCD_BA;
 		if (addr == match) {
 			ufshcd_mcq_nullify_sqe(utrd);
#1 lore raw

Bart,

Quoted 2 lines

Fix the calculation of the utrd pointer. This patch addresses the following Coverity complaint:

Applied to 6.10/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#2 lore raw
In reply to Bart Van Assche
Quoted 12 lines · Bart Van Assche

Fix the calculation of the utrd pointer. This patch addresses the following Coverity complaint:

CID 1538170: (#1 of 1): Extra sizeof expression (SIZEOF_MISMATCH) suspicious_pointer_arithmetic: Adding sq_head_slot * 32UL /* sizeof (struct utp_transfer_req_desc) */ to pointer hwq->sqe_base_addr of type struct utp_transfer_req_desc * is suspicious because adding an integral value to this pointer automatically scales that value by the size, 32 bytes, of the pointed-to type, struct utp_transfer_req_desc. Most likely, the multiplication by sizeof (struct utp_transfer_req_desc) in this expression is extraneous and should be eliminated.

Quoted 1 line

[...]

Applied to 6.10/scsi-queue, thanks!

[1/1] scsi/ufs: Fix ufshcd_mcq_sqe_search()

      https://git.kernel.org/mkp/scsi/c/3c5d0dce8ce0
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering