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=1794060555; b=rcNqd2xGat4EOWKOyGnPryqPkyqvbxio+fjHYUgOJE11yBsXA1TS62IYNfyEZjZEJJKV KFvPeiVC9mLfg4hm1utjoyy9b5jkybdQMynFi8w2pK75sy58j0OHo2a6tXMkZx029eEoN 2ZP50vL4zbZo58fw9Bo+u3fhInSQhQlAThNNK/vIChi1OmcFoyno3G51SiP58zH+mJ5hA n85sr3AUerh6091lCnmOslOdzt3Kj0HPs1GqtnysdggSvoc3QPxhkRIxgoH7e8KqXsx/X KjaQul+y0cf6AdSOuJc76eEu6zfjORKh0ndJuKTXEtiC7mkBv0bauRIez8b5Tlujc/w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794060555; 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-Type:Content-Transfer-Encoding; bh=zsYA+m1r5URt2JiuDRq+95sId5vE3f4kZtxWW2k0s5A=; b=EG01i6yxX6feh6LjxADelts5/Yk10jLei9ncJHtf7dJuQUeo2o9zsBAVRhKA3qakWbV6 dz2R8gzBcJxoiJT/EL6an0puMC67+xaJtk7duBfLu7ob92ax4nE9pc3DscIuM/IZb1JzY acMSAH0TFQC5BPgyve8jTQqzOnCbRJwVf+Ia2PjQjyzsjZptj109Q0ucZjJ8n8u9IdTF1 YdyIOaZMbumzkWMZSXTZ2ck+7/WxxmHfD6/OgpYN0ntudsD1NxAK6mo3DHGOSihiaAgOM E75Ij02r2IWVmsZ460SmuooBl70+1WaMQqYXsMLY9eRWKg4YA3zaHFoSIV4xi61hgiA== 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="Ltm5jq/r"; 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 1D295606A332; Sat, 7 Nov 2026 14:09:15 +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=Ltm5jq/r Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEEDB1F0089F; Sat, 7 Nov 2026 14:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794060555; bh=zsYA+m1r5URt2JiuDRq+95sId5vE3f4kZtxWW2k0s5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ltm5jq/rQOpMvONmUhA4pi5RIO84XGBWcBC8qCbI8DxQg3i7P8hkAPoK2Q0RKEXpw rKofuuZLsWBTyAAscJ2bJJoQf7KvY4mN8iQE3MkpB/zJI04zliEMzKYQ8Pt7AI9OV0 XmMRZQpD6lyJkv/D3q2OTWPL2deh6sogBw3xxoG0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Jason A. Donenfeld" , =?UTF-8?q?J=C3=A9r=C3=A9my=20Jean?= , Eric Biggers Subject: [PATCH 6.12 0020/1536] lib/crypto: arm64: Fix lost Poly1305 carry when resuming NEON state Date: Sat, 7 Nov 2026 08:33:56 -0500 Message-ID: <20261107134958.246669873@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134957.653319350@linuxfoundation.org> References: <20261107134957.653319350@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jérémy Jean commit 24f07e8c07a0c0dd275331cbb41c79a78741eef9 upstream. When poly1305_blocks_neon() resumes from a base 2^26 accumulator and the next update contains an odd number of full 16-byte blocks, it processes one leading block through poly1305_mult() so that the remaining NEON work has an even block count. That requires converting the accumulator to the base 2^64 form used by poly1305_mult(). The final ADC of that conversion stores the carry into d2, but the following accumulation and poly1305_mult() use h2. If the conversion carries across bit 128, the carry is dropped and the emitted tag is wrong. This was introduced by Cryptogams commit 03dc4adf91c8 ("arm/poly1305-armv*.pl: optimize branches."), which removed the reduction that consumed d2 shortly before Linux imported the code. OpenSSL's copy did not take that change. The carry is possible because the NEON code stores the accumulator [h0, h1, h2, h3, h4] in a lazily reduced, redundant base 2^26 form: its final carry chain leaves h0, h2, h3 < 2^26, but h1 and h4 may slightly exceed 2^26 - 1. For example, the reachable state h0 = 4 h1 = 2^26 h2 = 2^26 - 1 h3 = 2^26 - 1 h4 = 2^24 - 1 represents 4 + 2^26*2^26 + (2^26-1)*2^52 + (2^26-1)*2^78 + (2^24-1)*2^104 = 2^128 + 4, despite the bit representing the 2^128 term (bit 24 of h4) not being set; the extra comes from the h1 limb being above the normal base 2^26 range. When this value is converted into the non-redundant base 2^64 form, a carry into the new 2^128 bit (in bit 0 of h2) is necessary to preserve the value. Given the above bounds, a carry into bit 128 happens exactly when h1 >= 2^26, h2 = h3 = 2^26 - 1, and h4 mod 2^24 = 2^24 - 1. Store the carry into h2, matching the other base 2^26 to base 2^64 conversions in poly1305_blocks() and poly1305_emit(). This bug causes an incorrect tag to be emitted. However, this is unlikely to happen in practice where Poly1305 is used with a random key, since the random key tends to distribute the accumulator values throughout their valid range. There isn't an obvious way for an attacker without knowledge of the r_key to cause [h0, h1, h2, h3, h4] to land on the precise values where this bug occurs. [EB: Rewrote the commit message to more clearly describe the bug and its impact, and simplified explanation about why there's a carry bit.] Fixes: f569ca164751 ("crypto: arm64/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation") Cc: stable@vger.kernel.org Assisted-by: LLM Reviewed-by: Jason A. Donenfeld Signed-off-by: Jérémy Jean Link: https://patch.msgid.link/20261009125354.315476-2-ebiggers@kernel.org Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- arch/arm64/crypto/poly1305-armv8.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/crypto/poly1305-armv8.pl +++ b/arch/arm64/crypto/poly1305-armv8.pl @@ -372,7 +372,7 @@ poly1305_blocks_neon: adc $h1,$h1,xzr lsr $h2,x14,#24 adds $h1,$h1,x14,lsl#40 - adc $d2,$h2,xzr // can be partially reduced... + adc $h2,$h2,xzr // preserve carry into top limb ldp $d0,$d1,[$inp],#16 // load input sub $len,$len,#16