]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: isci: Fix dma_unmap_sg() nents value
authorThomas Fourier <fourier.thomas@gmail.com>
Fri, 27 Jun 2025 14:24:47 +0000 (16:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 10:05:03 +0000 (12:05 +0200)
[ Upstream commit 063bec4444d54e5f35d11949c5c90eaa1ff84c11 ]

The dma_unmap_sg() functions should be called with the same nents as the
dma_map_sg(), not the value the map function returned.

Fixes: ddcc7e347a89 ("isci: fix dma_unmap_sg usage")
Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>
Link: https://lore.kernel.org/r/20250627142451.241713-2-fourier.thomas@gmail.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/isci/request.c

index 0f0732d56800d9cd248e2300e0bbe3c4835b4a19..46d30a725d7e3726d5b4210ee17f9b2ce8a4ebd9 100644 (file)
@@ -2907,7 +2907,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
                                         task->total_xfer_len, task->data_dir);
                else  /* unmap the sgl dma addresses */
                        dma_unmap_sg(&ihost->pdev->dev, task->scatter,
-                                    request->num_sg_entries, task->data_dir);
+                                    task->num_scatter, task->data_dir);
                break;
        case SAS_PROTOCOL_SMP: {
                struct scatterlist *sg = &task->smp_task.smp_req;