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 11812337110; Fri, 17 Oct 2025 15:17:19 +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=1760714239; cv=none; b=dfp2ANczKkg0VkbOFq7PGp2Vmr48HkmI8+3aGvTeomUKln28JjMGABGmZC1ZhVqAbuUrnNfzz0l1F9gzLikwaJB+4e8kdPcmk8aLOzTgov9FY2mg4NCQpXL/OtjNSK6TXGUZs6HQrW/xJpC3P7jtrxLyIKN1Fy0hoYTSUhnXkXM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760714239; c=relaxed/simple; bh=BXjdk4BLCZi/rZIfHbZ+FlW49/xvup9c44uEdZZYOyY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R1ricB4UhKXwhZZtgKREsVH4xpz25oUyZLDdG6EbJkmF/KvYUkxFdbhBs5jqG1EEvhOzJMheLwrtS/PnXlQiUz01s+EDNl/dCTYQHqymkbS6HTrcrG5OnJcg0ylycouwjPFIEcPaWmkXzmCpydvavXMIDLt4hLUiVimt2rw1oIU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=E0ZSDEre; 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="E0ZSDEre" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94C90C4CEE7; Fri, 17 Oct 2025 15:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760714238; bh=BXjdk4BLCZi/rZIfHbZ+FlW49/xvup9c44uEdZZYOyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E0ZSDEre3c3mHiO91BapXBTsp6nuGiLgtc7+z48pwS3HtUzcYKDign+BWTUQBHheD U2syBTZaG+zxdC2mdvINEpxsig04VQQ1PXF7dEYsr7GJLGZQSAK+r7Sa+1vzSobLHP dKnHfQ1WUGCGuoiaTKV+8xzEURSNn0WPN4Z7XEaE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Muhammad Alifa Ramdhan , Herbert Xu , Sasha Levin Subject: [PATCH 6.12 076/277] crypto: essiv - Check ssize for decryption and in-place encryption Date: Fri, 17 Oct 2025 16:51:23 +0200 Message-ID: <20251017145149.913648752@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017145147.138822285@linuxfoundation.org> References: <20251017145147.138822285@linuxfoundation.org> User-Agent: quilt/0.69 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: Herbert Xu [ Upstream commit 6bb73db6948c2de23e407fe1b7ef94bf02b7529f ] Move the ssize check to the start in essiv_aead_crypt so that it's also checked for decryption and in-place encryption. Reported-by: Muhammad Alifa Ramdhan Fixes: be1eb7f78aa8 ("crypto: essiv - create wrapper template for ESSIV generation") Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/essiv.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/crypto/essiv.c b/crypto/essiv.c index e63fc6442e320..aa7ebc1235274 100644 --- a/crypto/essiv.c +++ b/crypto/essiv.c @@ -186,9 +186,14 @@ static int essiv_aead_crypt(struct aead_request *req, bool enc) const struct essiv_tfm_ctx *tctx = crypto_aead_ctx(tfm); struct essiv_aead_request_ctx *rctx = aead_request_ctx(req); struct aead_request *subreq = &rctx->aead_req; + int ivsize = crypto_aead_ivsize(tfm); + int ssize = req->assoclen - ivsize; struct scatterlist *src = req->src; int err; + if (ssize < 0) + return -EINVAL; + crypto_cipher_encrypt_one(tctx->essiv_cipher, req->iv, req->iv); /* @@ -198,19 +203,12 @@ static int essiv_aead_crypt(struct aead_request *req, bool enc) */ rctx->assoc = NULL; if (req->src == req->dst || !enc) { - scatterwalk_map_and_copy(req->iv, req->dst, - req->assoclen - crypto_aead_ivsize(tfm), - crypto_aead_ivsize(tfm), 1); + scatterwalk_map_and_copy(req->iv, req->dst, ssize, ivsize, 1); } else { u8 *iv = (u8 *)aead_request_ctx(req) + tctx->ivoffset; - int ivsize = crypto_aead_ivsize(tfm); - int ssize = req->assoclen - ivsize; struct scatterlist *sg; int nents; - if (ssize < 0) - return -EINVAL; - nents = sg_nents_for_len(req->src, ssize); if (nents < 0) return -EINVAL; -- 2.51.0