crypto: simd - Do not call crypto_alloc_tfm during registration

[ Upstream commit 3c44d31cb34ce4eb8311a2e73634d57702948230 ]

Algorithm registration is usually carried out during module init,
where as little work as possible should be carried out.  The SIMD
code violated this rule by allocating a tfm, this then triggers a
full test of the algorithm which may dead-lock in certain cases.

SIMD is only allocating the tfm to get at the alg object, which is
in fact already available as it is what we are registering.  Use
that directly and remove the crypto_alloc_tfm call.

Also remove some obsolete and unused SIMD API.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
index b668c97663ec0cf6b683f0ad1b763697dae48b56..f5b66f4cf45d96eac9b2f3658ce8efced7f68008 100644 (file)
--- a/arch/arm/crypto/aes-ce-glue.c
+++ b/arch/arm/crypto/aes-ce-glue.c
@@ -711,7 +711,7 @@ static int __init aes_init(void)
                algname = aes_algs[i].base.cra_name + 2;
                drvname = aes_algs[i].base.cra_driver_name + 2;
                basename = aes_algs[i].base.cra_driver_name;
-               simd = simd_skcipher_create_compat(algname, drvname, basename);
+               simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
                err = PTR_ERR(simd);
                if (IS_ERR(simd))
                        goto unregister_simds;

diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
index f00f042ef3570e7ef59fa3c2607f9fe0cd87aba1..0ca94b90bc4ec529f597a75b4cf46e6190ed6496 100644 (file)
--- a/arch/arm/crypto/aes-neonbs-glue.c
+++ b/arch/arm/crypto/aes-neonbs-glue.c
@@ -539,7 +539,7 @@ static int __init aes_init(void)
                algname = aes_algs[i].base.cra_name + 2;
                drvname = aes_algs[i].base.cra_driver_name + 2;
                basename = aes_algs[i].base.cra_driver_name;
-               simd = simd_skcipher_create_compat(algname, drvname, basename);
+               simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
                err = PTR_ERR(simd);
                if (IS_ERR(simd))
                        goto unregister_simds;

diff --git a/crypto/simd.c b/crypto/simd.c
index edaa479a1ec5e5027884c9826d3012067db4da5f..d109866641a265df2b3c2620fdd72622ca13701e 100644 (file)
--- a/crypto/simd.c
+++ b/crypto/simd.c
@@ -136,27 +136,19 @@ static int simd_skcipher_init(struct crypto_skcipher *tfm)
        return 0;
 }
 
-struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
+struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
+                                                     const char *algname,
                                                      const char *drvname,
                                                      const char *basename)
 {
        struct simd_skcipher_alg *salg;
-       struct crypto_skcipher *tfm;
-       struct skcipher_alg *ialg;
        struct skcipher_alg *alg;
        int err;
 
-       tfm = crypto_alloc_skcipher(basename, CRYPTO_ALG_INTERNAL,
-                                   CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);
-       if (IS_ERR(tfm))
-               return ERR_CAST(tfm);
-
-       ialg = crypto_skcipher_alg(tfm);
-
        salg = kzalloc(sizeof(*salg), GFP_KERNEL);
        if (!salg) {
                salg = ERR_PTR(-ENOMEM);
-               goto out_put_tfm;
+               goto out;
        }
 
        salg->ialg_name = basename;
@@ -195,30 +187,16 @@ struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
        if (err)
                goto out_free_salg;
 
-out_put_tfm:
-       crypto_free_skcipher(tfm);
+out:
        return salg;
 
 out_free_salg:
        kfree(salg);
        salg = ERR_PTR(err);
-       goto out_put_tfm;
+       goto out;
 }
 EXPORT_SYMBOL_GPL(simd_skcipher_create_compat);
 
-struct simd_skcipher_alg *simd_skcipher_create(const char *algname,
-                                              const char *basename)
-{
-       char drvname[CRYPTO_MAX_ALG_NAME];
-
-       if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) >=
-           CRYPTO_MAX_ALG_NAME)
-               return ERR_PTR(-ENAMETOOLONG);
-
-       return simd_skcipher_create_compat(algname, drvname, basename);
-}
-EXPORT_SYMBOL_GPL(simd_skcipher_create);
-
 void simd_skcipher_free(struct simd_skcipher_alg *salg)
 {
        crypto_unregister_skcipher(&salg->alg);
@@ -246,7 +224,7 @@ int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,
                algname = algs[i].base.cra_name + 2;
                drvname = algs[i].base.cra_driver_name + 2;
                basename = algs[i].base.cra_driver_name;
-               simd = simd_skcipher_create_compat(algname, drvname, basename);
+               simd = simd_skcipher_create_compat(algs + i, algname, drvname, basename);
                err = PTR_ERR(simd);
                if (IS_ERR(simd))
                        goto err_unregister;
@@ -383,27 +361,19 @@ static int simd_aead_init(struct crypto_aead *tfm)
        return 0;
 }
 
-struct simd_aead_alg *simd_aead_create_compat(const char *algname,
-                                             const char *drvname,
-                                             const char *basename)
+static struct simd_aead_alg *simd_aead_create_compat(struct aead_alg *ialg,
+                                                    const char *algname,
+                                                    const char *drvname,
+                                                    const char *basename)
 {
        struct simd_aead_alg *salg;
-       struct crypto_aead *tfm;
-       struct aead_alg *ialg;
        struct aead_alg *alg;
        int err;
 
-       tfm = crypto_alloc_aead(basename, CRYPTO_ALG_INTERNAL,
-                               CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);
-       if (IS_ERR(tfm))
-               return ERR_CAST(tfm);
-
-       ialg = crypto_aead_alg(tfm);
-
        salg = kzalloc(sizeof(*salg), GFP_KERNEL);
        if (!salg) {
                salg = ERR_PTR(-ENOMEM);
-               goto out_put_tfm;
+               goto out;
        }
 
        salg->ialg_name = basename;
@@ -442,36 +412,20 @@ struct simd_aead_alg *simd_aead_create_compat(const char *algname,
        if (err)
                goto out_free_salg;
 
-out_put_tfm:
-       crypto_free_aead(tfm);
+out:
        return salg;
 
 out_free_salg:
        kfree(salg);
        salg = ERR_PTR(err);
-       goto out_put_tfm;
-}
-EXPORT_SYMBOL_GPL(simd_aead_create_compat);
-
-struct simd_aead_alg *simd_aead_create(const char *algname,
-                                      const char *basename)
-{
-       char drvname[CRYPTO_MAX_ALG_NAME];
-
-       if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) >=
-           CRYPTO_MAX_ALG_NAME)
-               return ERR_PTR(-ENAMETOOLONG);
-
-       return simd_aead_create_compat(algname, drvname, basename);
+       goto out;
 }
-EXPORT_SYMBOL_GPL(simd_aead_create);
 
-void simd_aead_free(struct simd_aead_alg *salg)
+static void simd_aead_free(struct simd_aead_alg *salg)
 {
        crypto_unregister_aead(&salg->alg);
        kfree(salg);
 }
-EXPORT_SYMBOL_GPL(simd_aead_free);
 
 int simd_register_aeads_compat(struct aead_alg *algs, int count,
                               struct simd_aead_alg **simd_algs)
@@ -493,7 +447,7 @@ int simd_register_aeads_compat(struct aead_alg *algs, int count,
                algname = algs[i].base.cra_name + 2;
                drvname = algs[i].base.cra_driver_name + 2;
                basename = algs[i].base.cra_driver_name;
-               simd = simd_aead_create_compat(algname, drvname, basename);
+               simd = simd_aead_create_compat(algs + i, algname, drvname, basename);
                err = PTR_ERR(simd);
                if (IS_ERR(simd))
                        goto err_unregister;

diff --git a/include/crypto/internal/simd.h b/include/crypto/internal/simd.h
index d2316242a98843deed0128ef9470bcba3750caa0..be97b97a75dd2d0ab66fad8a6260c18ddf9eda3b 100644 (file)
--- a/include/crypto/internal/simd.h
+++ b/include/crypto/internal/simd.h
@@ -14,11 +14,10 @@
 struct simd_skcipher_alg;
 struct skcipher_alg;
 
-struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
+struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
+                                                     const char *algname,
                                                      const char *drvname,
                                                      const char *basename);
-struct simd_skcipher_alg *simd_skcipher_create(const char *algname,
-                                              const char *basename);
 void simd_skcipher_free(struct simd_skcipher_alg *alg);
 
 int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,
@@ -32,13 +31,6 @@ void simd_unregister_skciphers(struct skcipher_alg *algs, int count,
 struct simd_aead_alg;
 struct aead_alg;
 
-struct simd_aead_alg *simd_aead_create_compat(const char *algname,
-                                             const char *drvname,
-                                             const char *basename);
-struct simd_aead_alg *simd_aead_create(const char *algname,
-                                      const char *basename);
-void simd_aead_free(struct simd_aead_alg *alg);
-
 int simd_register_aeads_compat(struct aead_alg *algs, int count,
                               struct simd_aead_alg **simd_algs);