linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] crypto: x86/poly1305 - add back a needed assignment
@ 2020-10-23 22:27 Eric Biggers
  2020-10-23 22:40 ` Herbert Xu
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2020-10-23 22:27 UTC (permalink / raw)
  To: linux-crypto, Herbert Xu

From: Eric Biggers <ebiggers@google.com>

One of the assignments that was removed by commit 4a0c1de64bf9 ("crypto:
x86/poly1305 - Remove assignments with no effect") is actually needed,
since it affects the return value.

This fixes the following crypto self-test failure:

    alg: shash: poly1305-simd test failed (wrong result) on test vector 2, cfg="init+update+final aligned buffer"

Fixes: 4a0c1de64bf9 ("crypto: x86/poly1305 - Remove assignments with no effect")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---

Note, this is a regression in mainline, so please include this in a pull
request for 5.10.

 arch/x86/crypto/poly1305_glue.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c
index e508dbd91813..c44aba290fbb 100644
--- a/arch/x86/crypto/poly1305_glue.c
+++ b/arch/x86/crypto/poly1305_glue.c
@@ -158,6 +158,7 @@ static unsigned int crypto_poly1305_setdctxkey(struct poly1305_desc_ctx *dctx,
 			dctx->s[1] = get_unaligned_le32(&inp[4]);
 			dctx->s[2] = get_unaligned_le32(&inp[8]);
 			dctx->s[3] = get_unaligned_le32(&inp[12]);
+			acc += POLY1305_BLOCK_SIZE;
 			dctx->sset = true;
 		}
 	}
-- 
2.29.0.rc1.297.gfa9743e501-goog


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] crypto: x86/poly1305 - add back a needed assignment
  2020-10-23 22:27 [PATCH] crypto: x86/poly1305 - add back a needed assignment Eric Biggers
@ 2020-10-23 22:40 ` Herbert Xu
  0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2020-10-23 22:40 UTC (permalink / raw)
  To: Eric Biggers; +Cc: linux-crypto

On Fri, Oct 23, 2020 at 03:27:48PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> One of the assignments that was removed by commit 4a0c1de64bf9 ("crypto:
> x86/poly1305 - Remove assignments with no effect") is actually needed,
> since it affects the return value.
> 
> This fixes the following crypto self-test failure:
> 
>     alg: shash: poly1305-simd test failed (wrong result) on test vector 2, cfg="init+update+final aligned buffer"
> 
> Fixes: 4a0c1de64bf9 ("crypto: x86/poly1305 - Remove assignments with no effect")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> 
> Note, this is a regression in mainline, so please include this in a pull
> request for 5.10.
> 
>  arch/x86/crypto/poly1305_glue.c | 1 +
>  1 file changed, 1 insertion(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-23 22:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-23 22:27 [PATCH] crypto: x86/poly1305 - add back a needed assignment Eric Biggers
2020-10-23 22:40 ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).