Commit fa3b3565 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Add __crypto_alloc_tfmgfp 



Use it straight away in crypto_clone_cipher(), as that is not meant to
sleep.

Fixes: 51d8d6d0 ("crypto: cipher - Add crypto_clone_cipher")
Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fa919f9e

crypto/api.c

+10 −3
Original line number Diff line number Diff line
@@ -386,15 +386,15 @@ void crypto_shoot_alg(struct crypto_alg *alg) 
}

EXPORT_SYMBOL_GPL(crypto_shoot_alg);



struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,

				      u32 mask)

struct crypto_tfm *__crypto_alloc_tfmgfp(struct crypto_alg *alg, u32 type,

					 u32 mask, gfp_t gfp)

{

	struct crypto_tfm *tfm = NULL;

	unsigned int tfm_size;

	int err = -ENOMEM;



	tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, type, mask);

	tfm = kzalloc(tfm_size, GFP_KERNEL);

	tfm = kzalloc(tfm_size, gfp);

	if (tfm == NULL)

		goto out_err;
@@ -416,6 +416,13 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, 
out:

	return tfm;

}

EXPORT_SYMBOL_GPL(__crypto_alloc_tfmgfp);



struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,

				      u32 mask)

{

	return __crypto_alloc_tfmgfp(alg, type, mask, GFP_KERNEL);

}

EXPORT_SYMBOL_GPL(__crypto_alloc_tfm);



/*

crypto/cipher.c

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ struct crypto_cipher *crypto_clone_cipher(struct crypto_cipher *cipher) 
	if (alg->cra_init)

		return ERR_PTR(-ENOSYS);



	ntfm = __crypto_alloc_tfm(alg, CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK);

	ntfm = __crypto_alloc_tfmgfp(alg, CRYPTO_ALG_TYPE_CIPHER,

				     CRYPTO_ALG_TYPE_MASK, GFP_ATOMIC);

	if (IS_ERR(ntfm))

		return ERR_CAST(ntfm);

crypto/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list, 
			  struct crypto_alg *nalg);

void crypto_remove_final(struct list_head *list);

void crypto_shoot_alg(struct crypto_alg *alg);

struct crypto_tfm *__crypto_alloc_tfmgfp(struct crypto_alg *alg, u32 type,

					 u32 mask, gfp_t gfp);

struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,

				      u32 mask);

void *crypto_create_tfm_node(struct crypto_alg *alg,