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

crypto: aead - pass instance to crypto_grab_aead() 



Initializing a crypto_aead_spawn currently requires:

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

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_aead() 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 b9f76ddd

crypto/aead.c

+4 −2
Original line number Diff line number Diff line
@@ -207,9 +207,11 @@ static const struct crypto_type crypto_aead_type = { 
	.tfmsize = offsetof(struct crypto_aead, base),

};



int crypto_grab_aead(struct crypto_aead_spawn *spawn, const char *name,

		     u32 type, u32 mask)

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);

}

crypto/ccm.c

+5 −3
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl, 
				 struct rtattr **tb)

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct crypto_aead_spawn *spawn;

	struct aead_alg *alg;
@@ -747,6 +748,8 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



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



	ccm_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(ccm_name))

		return PTR_ERR(ccm_name);
@@ -756,9 +759,8 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl, 
		return -ENOMEM;



	spawn = aead_instance_ctx(inst);

	crypto_set_aead_spawn(spawn, aead_crypto_instance(inst));

	err = crypto_grab_aead(spawn, ccm_name, 0,

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

	err = crypto_grab_aead(spawn, aead_crypto_instance(inst),

			       ccm_name, 0, mask);

	if (err)

		goto out_free_inst;

crypto/cryptd.c

+2 −2
Original line number Diff line number Diff line
@@ -865,8 +865,8 @@ static int cryptd_create_aead(struct crypto_template *tmpl, 
	ctx = aead_instance_ctx(inst);

	ctx->queue = queue;



	crypto_set_aead_spawn(&ctx->aead_spawn, aead_crypto_instance(inst));

	err = crypto_grab_aead(&ctx->aead_spawn, name, type, mask);

	err = crypto_grab_aead(&ctx->aead_spawn, aead_crypto_instance(inst),

			       name, type, mask);

	if (err)

		goto out_free_inst;

crypto/essiv.c

+1 −2
Original line number Diff line number Diff line
@@ -500,8 +500,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb) 
		ictx = crypto_instance_ctx(inst);



		/* AEAD cipher, e.g., "authenc(hmac(sha256),cbc(aes))" */

		crypto_set_aead_spawn(&ictx->u.aead_spawn, inst);

		err = crypto_grab_aead(&ictx->u.aead_spawn,

		err = crypto_grab_aead(&ictx->u.aead_spawn, inst,

				       inner_cipher_name, 0, mask);

		if (err)

			goto out_free_inst;

crypto/gcm.c

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

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct crypto_aead_spawn *spawn;

	struct aead_alg *alg;
@@ -869,6 +870,8 @@ static int crypto_rfc4106_create(struct crypto_template *tmpl, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



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



	ccm_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(ccm_name))

		return PTR_ERR(ccm_name);
@@ -878,9 +881,8 @@ static int crypto_rfc4106_create(struct crypto_template *tmpl, 
		return -ENOMEM;



	spawn = aead_instance_ctx(inst);

	crypto_set_aead_spawn(spawn, aead_crypto_instance(inst));

	err = crypto_grab_aead(spawn, ccm_name, 0,

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

	err = crypto_grab_aead(spawn, aead_crypto_instance(inst),

			       ccm_name, 0, mask);

	if (err)

		goto out_free_inst;
@@ -1087,6 +1089,7 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 
				struct rtattr **tb)

{

	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct crypto_aead_spawn *spawn;

	struct aead_alg *alg;
@@ -1101,6 +1104,8 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)

		return -EINVAL;



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



	ccm_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(ccm_name))

		return PTR_ERR(ccm_name);
@@ -1111,9 +1116,8 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 


	ctx = aead_instance_ctx(inst);

	spawn = &ctx->aead;

	crypto_set_aead_spawn(spawn, aead_crypto_instance(inst));

	err = crypto_grab_aead(spawn, ccm_name, 0,

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

	err = crypto_grab_aead(spawn, aead_crypto_instance(inst),

			       ccm_name, 0, mask);

	if (err)

		goto out_free_inst;