diff options
author | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
---|---|---|
committer | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
commit | fe8cbbbc0e68dad845f72ad75c8099b88f7ff049 (patch) | |
tree | 2bf17da93b86508fe2f66e87f39897a1d4b403dc /crypto/chacha20poly1305.c | |
parent | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (diff) | |
parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
download | linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.tar.gz linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.zip |
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to '')
-rw-r--r-- | crypto/chacha20poly1305.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c index db1bc314..600afa99 100644 --- a/crypto/chacha20poly1305.c +++ b/crypto/chacha20poly1305.c @@ -610,6 +610,11 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, algt->mask)); if (IS_ERR(poly)) return PTR_ERR(poly); + poly_hash = __crypto_hash_alg_common(poly); + + err = -EINVAL; + if (poly_hash->digestsize != POLY1305_DIGEST_SIZE) + goto out_put_poly; err = -ENOMEM; inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL); @@ -618,7 +623,6 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, ctx = aead_instance_ctx(inst); ctx->saltlen = CHACHAPOLY_IV_SIZE - ivsize; - poly_hash = __crypto_hash_alg_common(poly); err = crypto_init_ahash_spawn(&ctx->poly, poly_hash, aead_crypto_instance(inst)); if (err) |