Commit 922cc13a authored by Herbert Xu's avatar Herbert Xu Committed by Wen Zhiwei
Browse files

crypto: simd - Do not call crypto_alloc_tfm during registration 

stable inclusion
from stable-v6.6.55
commit b60d2bc676e4e89c37f6c3ce3504b5cef21c8357
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b60d2bc676e4e89c37f6c3ce3504b5cef21c8357



--------------------------------

[ 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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Conflicts:
     arch/x86/crypto/sm4-zhaoxin-gmi.c
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent e4f2b5e9

arch/arm/crypto/aes-ce-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm/crypto/aes-neonbs-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/crypto/sm4-zhaoxin-gmi.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int __init gmi_sm4_init(void) 
		algname = sm4_algs[i].base.cra_name + 2;

		drvname = sm4_algs[i].base.cra_driver_name + 2;

		basename = sm4_algs[i].base.cra_driver_name;

		simd = simd_skcipher_create_compat(algname, drvname, basename);

		simd = simd_skcipher_create_compat(sm4_algs, algname, drvname, basename);

		err = PTR_ERR(simd);

		if (IS_ERR(simd))

			goto unregister_simds;

crypto/simd.c

+15 −61
Original line number Diff line number Diff line
@@ -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,

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;

include/crypto/internal/simd.h

+2 −10
Original line number Diff line number Diff line
@@ -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);