summaryrefslogtreecommitdiffstats
path: root/crypto/adiantum.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2020-01-02 19:58:48 -0800
committerHerbert Xu <herbert@gondor.apana.org.au>2020-01-09 11:30:54 +0800
commitde95c9574108ec304083ed574304ab3b60b4167c (patch)
treee935789d6abcbbc7f49cf5a6479028e023a312ad /crypto/adiantum.c
parent73bed26f73a120f14cabf8d214ec5078bb42dea9 (diff)
downloadlinux-de95c9574108ec304083ed574304ab3b60b4167c.tar.gz
linux-de95c9574108ec304083ed574304ab3b60b4167c.tar.bz2
linux-de95c9574108ec304083ed574304ab3b60b4167c.zip
crypto: algapi - pass instance to crypto_grab_spawn()
Currently, crypto_spawn::inst is first used temporarily to pass the instance to crypto_grab_spawn(). Then crypto_init_spawn() overwrites it with crypto_spawn::next, which shares the same union. Finally, crypto_spawn::inst is set again when the instance is registered. Make this less convoluted by just passing the instance as an argument to crypto_grab_spawn() instead. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/adiantum.c')
-rw-r--r--crypto/adiantum.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/adiantum.c b/crypto/adiantum.c
index 567071464fab..76a41881ee8c 100644
--- a/crypto/adiantum.c
+++ b/crypto/adiantum.c
@@ -542,9 +542,9 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
streamcipher_alg = crypto_spawn_skcipher_alg(&ictx->streamcipher_spawn);
/* Block cipher, e.g. "aes" */
- crypto_set_spawn(&ictx->blockcipher_spawn,
- skcipher_crypto_instance(inst));
- err = crypto_grab_spawn(&ictx->blockcipher_spawn, blockcipher_name,
+ err = crypto_grab_spawn(&ictx->blockcipher_spawn,
+ skcipher_crypto_instance(inst),
+ blockcipher_name,
CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK);
if (err)
goto out_drop_streamcipher;