Skip to contentSkip to conversation

crypto: x86/poly1305 - add back a needed assignment

PATCH In review Eric Biggers 2 participants 2 messages Oct 23, 2020

Subsystems (2)
x86 Crypto API
lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/1 crypto: x86/poly1305 - add back a needed assignment

From: Eric Biggers <[email protected]>

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 <[email protected]>

---

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(+)
arch/x86/crypto/poly1305_glue.c +1 -0
index e508dbd91813..c44aba290fbb 100644
@@ -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;
 		}
 	}
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
maintainer
#1 lore raw
Quoted 12 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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 <[email protected]>
Quoted 7 lines

---

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.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt