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>

diff --git a/crypto/adiantum.c b/crypto/adiantum.c
index 567071464fabe772f9435e3a4dd0fa1fc72268ca..76a41881ee8c0c33634f6e0547faa65ac0a3fecd 100644 (file)
--- 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;

diff --git a/crypto/aead.c b/crypto/aead.c
index c7135e00b8ea94125dddf4984787bf0846d92778..02a0db076d7ebb7a259f9ad60738520014a51a39 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -211,9 +211,8 @@ int crypto_grab_aead(struct crypto_aead_spawn *spawn,
                     struct crypto_instance *inst,
                     const char *name, u32 type, u32 mask)
 {
-       spawn->base.inst = inst;
        spawn->base.frontend = &crypto_aead_type;
-       return crypto_grab_spawn(&spawn->base, name, type, mask);
+       return crypto_grab_spawn(&spawn->base, inst, name, type, mask);
 }
 EXPORT_SYMBOL_GPL(crypto_grab_aead);
 

diff --git a/crypto/akcipher.c b/crypto/akcipher.c
index 84ccf9b02bbe60b11a7a18b15906155b21184e13..eeed6c151d2f931e079596ee02ac721133585fb1 100644 (file)
--- a/crypto/akcipher.c
+++ b/crypto/akcipher.c
@@ -94,9 +94,8 @@ int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn,
                         struct crypto_instance *inst,
                         const char *name, u32 type, u32 mask)
 {
-       spawn->base.inst = inst;
        spawn->base.frontend = &crypto_akcipher_type;
-       return crypto_grab_spawn(&spawn->base, name, type, mask);
+       return crypto_grab_spawn(&spawn->base, inst, name, type, mask);
 }
 EXPORT_SYMBOL_GPL(crypto_grab_akcipher);
 

diff --git a/crypto/algapi.c b/crypto/algapi.c
index a5223c5f22751c0445f10cbcc217fec91c94d51a..a25ce02918f8a01109478f8771df52ddbe0d3131 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -714,8 +714,8 @@ out:
 }
 EXPORT_SYMBOL_GPL(crypto_init_spawn2);
 
-int crypto_grab_spawn(struct crypto_spawn *spawn, const char *name,
-                     u32 type, u32 mask)
+int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
+                     const char *name, u32 type, u32 mask)
 {
        struct crypto_alg *alg;
        int err;
@@ -729,7 +729,7 @@ int crypto_grab_spawn(struct crypto_spawn *spawn, const char *name,
                return PTR_ERR(alg);
 
        spawn->dropref = true;
-       err = crypto_init_spawn(spawn, alg, spawn->inst, mask);
+       err = crypto_init_spawn(spawn, alg, inst, mask);
        if (err)
                crypto_mod_put(alg);
        return err;

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 8759d473a154e40df180489602fd92551a94a34d..15c033c960f70989566dd26a0ae018ee68bc37d4 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -750,9 +750,8 @@ int crypto_grab_skcipher(struct crypto_skcipher_spawn *spawn,
                         struct crypto_instance *inst,
                         const char *name, u32 type, u32 mask)
 {
-       spawn->base.inst = inst;
        spawn->base.frontend = &crypto_skcipher_type;
-       return crypto_grab_spawn(&spawn->base, name, type, mask);
+       return crypto_grab_spawn(&spawn->base, inst, name, type, mask);
 }
 EXPORT_SYMBOL_GPL(crypto_grab_skcipher);
 

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 5022cada4fc6bd80f5eb320c3bc6cd8e65355623..2779c8d34ba9df5f087416665dfd76dbb923e398 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -116,20 +116,14 @@ int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
 int crypto_init_spawn2(struct crypto_spawn *spawn, struct crypto_alg *alg,
                       struct crypto_instance *inst,
                       const struct crypto_type *frontend);
-int crypto_grab_spawn(struct crypto_spawn *spawn, const char *name,
-                     u32 type, u32 mask);
+int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
+                     const char *name, u32 type, u32 mask);
 
 void crypto_drop_spawn(struct crypto_spawn *spawn);
 struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
                                    u32 mask);
 void *crypto_spawn_tfm2(struct crypto_spawn *spawn);
 
-static inline void crypto_set_spawn(struct crypto_spawn *spawn,
-                                   struct crypto_instance *inst)
-{
-       spawn->inst = inst;
-}
-
 struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb);
 int crypto_check_attr_type(struct rtattr **tb, u32 type);
 const char *crypto_attr_alg_name(struct rtattr *rta);