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 0A7E3285C89; Tue, 12 Aug 2025 19:16:43 +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=1755026203; cv=none; b=o0yELPkbGIKe2yetKb+IoMlkSlFhCYcq5TK7Uena6JaSLAau6g5FcYbi0L7uHRBX2HepKb4xiZpreOO+uK80g5fRGZaRO/2HwZHZBtSjO91TriisioaMj6GFrkRbfkSf/bAZUrWIF2KaF87P7ZYvFKhq63rsQvqgL/KqKtdKyxc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026203; c=relaxed/simple; bh=i4TtQDmR/8KzDqUReUKKHd6JBF+giWnsLlpac84r8VU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NSYEFyhQAMTSiJKnrIM5wrpvCj/yasIte/xe2oqYEtSGBEgBMrS8BAGSudE6mXOBWT8GqDEnVLo95LnDFLFXzm1+yL5ScB5fI3ex/quSyEL7Z6NCwFit0LEiP80MIoGrk+MV+7+ee4KCtqzDJzYpZExjmYRFKur1RoU5wrQWXXY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vzCE75D4; 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="vzCE75D4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 691B4C4CEF1; Tue, 12 Aug 2025 19:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026202; bh=i4TtQDmR/8KzDqUReUKKHd6JBF+giWnsLlpac84r8VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vzCE75D4wDce3MLvZnQlUJY+TAHVT6a59fKzV+aBaSMUChM0ViEwJUUcjqoombA4x b+evrFyRL6+YlaTNppbdwGrR86h4UUKlrsIF2Lz9R6cENkGnryHyHzdl0XLEty+nAy DEjjikgkMv/Vn17HZpfHCbzmaicJ3vGg326gqFJU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Antoine Tenart , Herbert Xu , Sasha Levin Subject: [PATCH 6.15 268/480] crypto: inside-secure - Fix `dma_unmap_sg()` nents value Date: Tue, 12 Aug 2025 19:47:56 +0200 Message-ID: <20250812174408.496422152@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit cb7fa6b6fc71e0c801e271aa498e2f19e6df2931 ] 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: c957f8b3e2e5 ("crypto: inside-secure - avoid unmapping DMA memory that was not mapped") Signed-off-by: Thomas Fourier Reviewed-by: Antoine Tenart Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/inside-secure/safexcel_hash.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c index f44c08f5f5ec..af4b978189e5 100644 --- a/drivers/crypto/inside-secure/safexcel_hash.c +++ b/drivers/crypto/inside-secure/safexcel_hash.c @@ -249,7 +249,9 @@ static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, safexcel_complete(priv, ring); if (sreq->nents) { - dma_unmap_sg(priv->dev, areq->src, sreq->nents, DMA_TO_DEVICE); + dma_unmap_sg(priv->dev, areq->src, + sg_nents_for_len(areq->src, areq->nbytes), + DMA_TO_DEVICE); sreq->nents = 0; } @@ -497,7 +499,9 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring, DMA_FROM_DEVICE); unmap_sg: if (req->nents) { - dma_unmap_sg(priv->dev, areq->src, req->nents, DMA_TO_DEVICE); + dma_unmap_sg(priv->dev, areq->src, + sg_nents_for_len(areq->src, areq->nbytes), + DMA_TO_DEVICE); req->nents = 0; } cdesc_rollback: -- 2.39.5