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=1792773991; b=PUKTD9zoKN0efHtMlsEE5hZ5cvzqyhLVN9X3Enbnye5bryTjq18s2VAzFqwjI+3guvzf HisUAd0wdDBjTtZf6YG4KqWAS99WfU1xjhF2fDbw/5cgo5HNaMGYUtuMD0xmxAhgLct3t o1G5kDr6iSkblAdi2Q5xNv+MdDmt9Xv/PtMeUG7QCRG8Nx6+K6v13Q2KzoYku7q0gZqxr N4X/W6ZNnjxiVg8ccu8JFwRb7hWDKcI+YmihznOzOjn6MHpOwxYgwkewejRFq6gLg0SnB i8i+2rZ5U2jCIwGJ1ipYN/jua9fG+6Le0ARFxbFbp72Mo0MdBP6KSBtndGpNWoaWf3Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792773991; 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=/llm91q3Rbajb0eMBBWdNZZ6ePBafNZP9ubcM1dzdBs=; b=fwEsrzFIM8MRK3ivo5En+S7C6CIJnRu6QA9HigA6EEydQS+BqpMb33WiSsLEZi+txe2s pR/sAXDw3jiwgwesyETCgrt53qUo0JWi3Zdd6iTfznZ1wqiLz0lLK5JaOmPmNAR7jmgHE eY8BFSB11aKRUu3Au/xwXwDWut+IHoOT5dRr11qSnePFBEyGBGGjng9nmOKLGBZ5ozsot /eXKXhXSFIiNcOr1b9za6D7CYHgz8uKT9XYP+HUK7yXAf+zjTpImlpgGeaWkWYvVB34lb RREOtrNLFNoeKnNpICG1mnvtvc5UjrmU9AjW2r+9WYDTmafxpjVAkA2iMvolumai/LQ== 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=RCtseA7U; 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 8431E606A31E; Fri, 23 Oct 2026 16:46:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=RCtseA7U Received: by smtp.kernel.org (Postfix) with ESMTPSA id D629B1F031E0; Fri, 23 Oct 2026 16:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792773991; bh=/llm91q3Rbajb0eMBBWdNZZ6ePBafNZP9ubcM1dzdBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RCtseA7UFIBuyZO+sS9HGthshUnIzWRzpeInreBS+U0l5GOBKLWcyGNnErEZTAQyb xTvYwAqtUPqKwKgas0AaiKYpBG9SLCDlthhmbsMSTAualcVNqxefyCTAmD42mMtNIS 3psZghrX1NLk0EknjtEy7i0Lmqd9s/bs0kbcb+1k= 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.18 083/193] lib/crypto: arm64: Fix lost Poly1305 carry when resuming NEON state Date: Fri, 23 Oct 2026 18:36:00 +0200 Message-ID: <20261023163716.169495504@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261023163714.201276352@linuxfoundation.org> References: <20261023163714.201276352@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-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 --- lib/crypto/arm64/poly1305-armv8.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/lib/crypto/arm64/poly1305-armv8.pl +++ b/lib/crypto/arm64/poly1305-armv8.pl @@ -375,7 +375,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