From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26B842DFA3E; Tue, 12 Aug 2025 18:16:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022599; cv=none; b=t6775Chcm+b73HRUHPZ7zQfubLZePizFnmcmlp5tC/ym001+tvE3OhtOQqs6wvBQplBA6Cds8A5W5EZdjXxTLlIsxqKuRV/RZL71+k8RyplarZRcpDSfm2tGTlSue+nZV395xynZgAVZZzMNV4gVrm2OK1NzKHH0slnWix1O68o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022599; c=relaxed/simple; bh=q9F7VSCENarbANjKHzeKI36XLN5cTadF0s8LKgPTgy4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qp7jIhwuHPHwG9wRWcKAFADWTZ1DYLePLPhuI6+PCc8O0ZB/7TcNgl0V9xr2PPN9ufHOY9QrfcXNCHJn+BwqfbjsgYf4mp/TgJXcrHpqNVd9X5q9X3m+zrMQjQ/RidiRLTYEF48Kqvh7EVs43YLeZigqqpNX/JFqaIhLTACOcjM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PnIj82Kd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PnIj82Kd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2811EC4CEF6; Tue, 12 Aug 2025 18:16:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755022599; bh=q9F7VSCENarbANjKHzeKI36XLN5cTadF0s8LKgPTgy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PnIj82KdFQX2AI7HrA8jPTaQNTp0ykuCn21UPC3RW8EEbGjEpPzDlyejXD/T2jUyj tTqRCWTmZfSkqqI1AoBds8iEQzDLsC4Ua9h0N6UxH6fRAD246lGRFBWCNHAlsfNS1p ToK44JPo8jCfWH08TmW7Nuro5/4fo5JffalOhjPU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.12 202/369] scsi: mvsas: Fix dma_unmap_sg() nents value Date: Tue, 12 Aug 2025 19:28:19 +0200 Message-ID: <20250812173022.367564803@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173014.736537091@linuxfoundation.org> References: <20250812173014.736537091@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit 0141618727bc929fe868153d21797f10ce5bef3f ] 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: b5762948263d ("[SCSI] mvsas: Add Marvell 6440 SAS/SATA driver") Signed-off-by: Thomas Fourier Link: https://lore.kernel.org/r/20250627134822.234813-2-fourier.thomas@gmail.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mvsas/mv_sas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 1444b1f1c4c8..d6897432cf0f 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -828,7 +828,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf dev_printk(KERN_ERR, mvi->dev, "mvsas prep failed[%d]!\n", rc); if (!sas_protocol_ata(task->task_proto)) if (n_elem) - dma_unmap_sg(mvi->dev, task->scatter, n_elem, + dma_unmap_sg(mvi->dev, task->scatter, task->num_scatter, task->data_dir); prep_out: return rc; @@ -874,7 +874,7 @@ static void mvs_slot_task_free(struct mvs_info *mvi, struct sas_task *task, if (!sas_protocol_ata(task->task_proto)) if (slot->n_elem) dma_unmap_sg(mvi->dev, task->scatter, - slot->n_elem, task->data_dir); + task->num_scatter, task->data_dir); switch (task->task_proto) { case SAS_PROTOCOL_SMP: -- 2.39.5