From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795029450; b=XJOhnLD75FOVhlT8g+okUTHRTNpuhlAztoPMoQsrt75v4IcmqEkmA1ymv3IT2NHgLevQ mJaqoAFuOmKddqoLiqmqKNrNTY1YJCec3b2DSaXShtNrPq5ONC+tR1+8hqWn4PNGgwzES CEPSjEVBWkN8fRA7mf7u7Iz4paTJugd9QUqrAt04+gR880sWPlBT7duNj5cYXFUZVl+cX 34nZS2MRuO77lyGNp8QySU1t3pXOai8uurgxuBjtyhVqYDSvwhkU9gTff6WgLXAn3kGtW h50kVwPsJAyuas8Tq86wM4s5EllqlZar2GyBy9XCCNu4P4zQaq9QiQmhvxhjJeJn/3g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029450; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Y0IbbboqVbCBmT0r9h2heUQy1JSEGmdrr9izwZ6UPR8=; b=3W7hpxny0PJKbDu32RV2Uy4e22EsT5e53459jjGx89/CAKb7k2UiC4+yFJUSUSQjte6n sTuliACENuYYRDotiNxouE5ER6l5FefTU+FyGnSCfRf8hJvYdbjfdJUWZrx2Yaew41chU p/2dFxLfb/48LSSVF3Wfsy2Q71cafIeiODWYCTs78IQR5FmtjDIelHwY1HNU4nY1P74Rd NfiMjqzO75rqQOvNujyUmYcW0xwaMk3nP+BQDTi8mwLqkdso5fCEABvJcOfygsCx3lAVi Ke/d3OE8AwDW5VWTLi1veEUZJ45oNYhyrfYm3K7ZQYW9s5ge5Z391y/nRab83pRGg0Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=yverOUZC; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E03C2606A320; Wed, 18 Nov 2026 19:17:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=yverOUZC Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41F521F000CC; Wed, 18 Nov 2026 19:17:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029449; bh=Y0IbbboqVbCBmT0r9h2heUQy1JSEGmdrr9izwZ6UPR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yverOUZCUXLHvVMxgvQw0mjfVVCnRDAic/awqA31mwsmFlU8xMzF0u/obvFnepu9F vU3dBOzGqGHVkWpdQoG+blcxTy4ujhVBy/kO41qMQElzO8W3C9DVZT+XT77KhmMR1O MC9VNeibVWtb4Dv4VfYh1Mxlq+taNrMo4VzdH77U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mohamad Raizudeen , Herbert Xu , Sasha Levin Subject: [PATCH 6.12 0353/1756] crypto: amlogic - Fix DMA memory leak in cipher error path Date: Wed, 18 Nov 2026 15:41:20 +0100 Message-ID: <20261118150022.405438166@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mohamad Raizudeen [ Upstream commit 6c2373dd818b777d0a81eb02acebc03940552dcd ] A DMA memory leak occurs in meson_cipher() on the mapping error paths. The driver jumps to the end of the function without unmapping the previously mapped source scatterlist and key/IV buffer when the destination apping fails. Additionally, a memory leak occurs when a scatterlist mapping succeeds but the returned count exceeds the driver's MAXDESC limit. In this case, the driver rejects the mapping without unmapping it. The BIDIRECTIONAL mapping branch also lacks the required 'MAXDESC -3' upper bound check. Fix this by introducing proper error labels, error_src and error_keyiv and unmap resources immediately inside the calidation checks to ensure all successfully mapped resources are cleaned up before returning the error. Fixes: 48fe583fe541 ("crypto: amlogic - Add crypto accelerator for amlogic GXL") Signed-off-by: Mohamad Raizudeen Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 25 ++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c index 29048da6f50a7..d78815b0547d8 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -177,10 +177,13 @@ static int meson_cipher(struct skcipher_request *areq) if (areq->src == areq->dst) { nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_BIDIRECTIONAL); - if (!nr_sgs) { - dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs); + if (!nr_sgs || nr_sgs > MAXDESC - 3) { + dev_err(mc->dev, "Invalid BIDIR SG count %d\n", nr_sgs); err = -EINVAL; - goto theend; + + if (nr_sgs) + dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_BIDIRECTIONAL); + goto error_keyiv; } nr_sgd = nr_sgs; } else { @@ -189,14 +192,20 @@ static int meson_cipher(struct skcipher_request *areq) if (!nr_sgs || nr_sgs > MAXDESC - 3) { dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs); err = -EINVAL; - goto theend; + + if (nr_sgs) + dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE); + goto error_keyiv; } nr_sgd = dma_map_sg(mc->dev, areq->dst, sg_nents(areq->dst), DMA_FROM_DEVICE); if (!nr_sgd || nr_sgd > MAXDESC - 3) { dev_err(mc->dev, "Invalid SG count %d\n", nr_sgd); err = -EINVAL; - goto theend; + + if (nr_sgd) + dma_unmap_sg(mc->dev, areq->dst, sg_nents(areq->dst), DMA_FROM_DEVICE); + goto error_src; } } @@ -251,6 +260,12 @@ static int meson_cipher(struct skcipher_request *areq) ivsize, 0); } } + goto theend; + +error_src: + dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE); +error_keyiv: + dma_unmap_single(mc->dev, phykeyiv, keyivlen, DMA_TO_DEVICE); theend: kfree_sensitive(bkeyiv); kfree_sensitive(backup_iv); -- 2.53.0