Commit b9f76ddd authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: skcipher - pass instance to crypto_grab_skcipher() 



Initializing a crypto_skcipher_spawn currently requires:

1. Set spawn->base.inst to point to the instance.
2. Call crypto_grab_skcipher().

But there's no reason for these steps to be separate, and in fact this
unneeded complication has caused at least one bug, the one fixed by
commit 6db43410 ("crypto: adiantum - initialize crypto_spawn::inst")

So just make crypto_grab_skcipher() take the instance as an argument.

To keep the function calls from getting too unwieldy due to this extra
argument, also introduce a 'mask' variable into the affected places
which weren't already using one.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 77f7e94d

crypto/adiantum.c

+6 −5
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ static bool adiantum_supported_algorithms(struct skcipher_alg *streamcipher_alg, 
static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)

{

	struct crypto_attr_type *algt;

	u32 mask;

	const char *streamcipher_name;

	const char *blockcipher_name;

	const char *nhpoly1305_name;
@@ -511,6 +512,8 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb) 
	if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)

		return -EINVAL;



	mask = crypto_requires_sync(algt->type, algt->mask);



	streamcipher_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(streamcipher_name))

		return PTR_ERR(streamcipher_name);
@@ -531,11 +534,9 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb) 
	ictx = skcipher_instance_ctx(inst);



	/* Stream cipher, e.g. "xchacha12" */

	crypto_set_skcipher_spawn(&ictx->streamcipher_spawn,

				  skcipher_crypto_instance(inst));

	err = crypto_grab_skcipher(&ictx->streamcipher_spawn, streamcipher_name,

				   0, crypto_requires_sync(algt->type,

							   algt->mask));

	err = crypto_grab_skcipher(&ictx->streamcipher_spawn,

				   skcipher_crypto_instance(inst),

				   streamcipher_name, 0, mask);

	if (err)

		goto out_free_inst;

	streamcipher_alg = crypto_spawn_skcipher_alg(&ictx->streamcipher_spawn);

crypto/authenc.c

+6 −6
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl, 
				 struct rtattr **tb)

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct hash_alg_common *auth;

	struct crypto_alg *auth_base;
@@ -388,9 +389,10 @@ static int crypto_authenc_create(struct crypto_template *tmpl, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



	mask = crypto_requires_sync(algt->type, algt->mask);



	auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,

			      CRYPTO_ALG_TYPE_AHASH_MASK |

			      crypto_requires_sync(algt->type, algt->mask));

			      CRYPTO_ALG_TYPE_AHASH_MASK | mask);

	if (IS_ERR(auth))

		return PTR_ERR(auth);
@@ -413,10 +415,8 @@ static int crypto_authenc_create(struct crypto_template *tmpl, 
	if (err)

		goto err_free_inst;



	crypto_set_skcipher_spawn(&ctx->enc, aead_crypto_instance(inst));

	err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	err = crypto_grab_skcipher(&ctx->enc, aead_crypto_instance(inst),

				   enc_name, 0, mask);

	if (err)

		goto err_drop_auth;

crypto/authencesn.c

+6 −6
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl, 
				     struct rtattr **tb)

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct hash_alg_common *auth;

	struct crypto_alg *auth_base;
@@ -406,9 +407,10 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



	mask = crypto_requires_sync(algt->type, algt->mask);



	auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,

			      CRYPTO_ALG_TYPE_AHASH_MASK |

			      crypto_requires_sync(algt->type, algt->mask));

			      CRYPTO_ALG_TYPE_AHASH_MASK | mask);

	if (IS_ERR(auth))

		return PTR_ERR(auth);
@@ -431,10 +433,8 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl, 
	if (err)

		goto err_free_inst;



	crypto_set_skcipher_spawn(&ctx->enc, aead_crypto_instance(inst));

	err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	err = crypto_grab_skcipher(&ctx->enc, aead_crypto_instance(inst),

				   enc_name, 0, mask);

	if (err)

		goto err_drop_auth;

crypto/ccm.c

+5 −4
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl, 
				    const char *mac_name)

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct skcipher_alg *ctr;

	struct crypto_alg *mac_alg;
@@ -464,6 +465,8 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



	mask = crypto_requires_sync(algt->type, algt->mask);



	mac_alg = crypto_find_alg(mac_name, &crypto_ahash_type,

				  CRYPTO_ALG_TYPE_HASH,

				  CRYPTO_ALG_TYPE_AHASH_MASK |
@@ -488,10 +491,8 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl, 
	if (err)

		goto err_free_inst;



	crypto_set_skcipher_spawn(&ictx->ctr, aead_crypto_instance(inst));

	err = crypto_grab_skcipher(&ictx->ctr, ctr_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	err = crypto_grab_skcipher(&ictx->ctr, aead_crypto_instance(inst),

				   ctr_name, 0, mask);

	if (err)

		goto err_drop_mac;

crypto/chacha20poly1305.c

+6 −7
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, 
			     const char *name, unsigned int ivsize)

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct skcipher_alg *chacha;

	struct crypto_alg *poly;
@@ -576,6 +577,8 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



	mask = crypto_requires_sync(algt->type, algt->mask);



	chacha_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(chacha_name))

		return PTR_ERR(chacha_name);
@@ -585,9 +588,7 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, 


	poly = crypto_find_alg(poly_name, &crypto_ahash_type,

			       CRYPTO_ALG_TYPE_HASH,

			       CRYPTO_ALG_TYPE_AHASH_MASK |

			       crypto_requires_sync(algt->type,

						    algt->mask));

			       CRYPTO_ALG_TYPE_AHASH_MASK | mask);

	if (IS_ERR(poly))

		return PTR_ERR(poly);

	poly_hash = __crypto_hash_alg_common(poly);
@@ -608,10 +609,8 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, 
	if (err)

		goto err_free_inst;



	crypto_set_skcipher_spawn(&ctx->chacha, aead_crypto_instance(inst));

	err = crypto_grab_skcipher(&ctx->chacha, chacha_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	err = crypto_grab_skcipher(&ctx->chacha, aead_crypto_instance(inst),

				   chacha_name, 0, mask);

	if (err)

		goto err_drop_poly;