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 5C27626B2C8; Tue, 12 Aug 2025 17:47:26 +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=1755020846; cv=none; b=CMGMTXRknjACd606BAAK7PiGjOPs2YorX4Q+HGIlRgOy7VpLlj6B/sRO7z0Rtp+vVD7grl9A2KSRj8C8itOA6e6Kyyq/UbsVDch6EggA2MsnGc3OEDjWapqYIaouPt/A88+hflvhrPHZa4iWYx+dsdgBei2y9sAT027swx8SoXc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755020846; c=relaxed/simple; bh=Hq6O4pTSaiLQuLQAim/UQ+SgTN9jub2ENZEvBNKZyd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uew8XD7DaBaj/66Jjnyll1ICXZ8qSfe3nR9xz001K3QryRcGlR4O1/aVa5SqN3Y8zh3MAdCy3KMGwqt92KyEpCpPuCRgbz8wQNa5DxAFgIEwyoIszjF7BoTp4noXrQlL2qnw3ez7KFEbJ3G15To7ymLs1xauRxWS8H60IQzCu/8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1awF7f30; 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="1awF7f30" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C38A4C4CEF1; Tue, 12 Aug 2025 17:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755020846; bh=Hq6O4pTSaiLQuLQAim/UQ+SgTN9jub2ENZEvBNKZyd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1awF7f30tMHDK31TFpciMQbSRlvaC8ATS3GXl9ktfslGEuWAdMbz1noBIoO7/CD9h XGLgHKGw2b41Q14pW4vXCyslWHnrwBG7/SanalsntvZLYRvx3Yb34IW02Kr9XdIib8 OdINrhejgDRVGFlqP1iIMjjAZes5sU5uzcmbP/RM= 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.1 163/253] scsi: mvsas: Fix dma_unmap_sg() nents value Date: Tue, 12 Aug 2025 19:29:11 +0200 Message-ID: <20250812172955.652802095@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812172948.675299901@linuxfoundation.org> References: <20250812172948.675299901@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.1-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 a6867dae0e7c..1275f3be530f 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -831,7 +831,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; @@ -877,7 +877,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