]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: ufs: core: mcq: Fix ufshcd_mcq_sqe_search()
authorBart Van Assche <bvanassche@acm.org>
Wed, 10 Apr 2024 00:07:45 +0000 (17:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2024 07:49:15 +0000 (09:49 +0200)
[ Upstream commit 3c5d0dce8ce0a2781ac306b9ad1492b005ecbab5 ]

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 <quic_nguyenb@quicinc.com>
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Can Guo <quic_cang@quicinc.com>
Fixes: 8d7290348992 ("scsi: ufs: mcq: Add supporting functions for MCQ abort")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240410000751.1047758-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/ufs/core/ufs-mcq.c

index c873fd8239427fdb5c07b913416e937cbc0e4ef9..7ae3096814282c15d11ba7c74f30a812ebe4904b 100644 (file)
@@ -597,8 +597,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);