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

crypto: akcipher - pass instance to crypto_grab_akcipher() 



Initializing a crypto_akcipher_spawn currently requires:

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

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_akcipher() take the instance as an argument.

To keep the function call from getting too unwieldy due to this extra
argument, also introduce a 'mask' variable into pkcs1pad_create().

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

crypto/akcipher.c

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

};



int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn, const char *name,

			 u32 type, u32 mask)

int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn,

			 struct crypto_instance *inst,

			 const char *name, u32 type, u32 mask)

{

	spawn->base.inst = inst;

	spawn->base.frontend = &crypto_akcipher_type;

	return crypto_grab_spawn(&spawn->base, name, type, mask);

}

crypto/rsa-pkcs1pad.c

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

	const struct rsa_asn1_template *digest_info;

	struct crypto_attr_type *algt;

	u32 mask;

	struct akcipher_instance *inst;

	struct pkcs1pad_inst_ctx *ctx;

	struct crypto_akcipher_spawn *spawn;
@@ -613,6 +614,8 @@ static int pkcs1pad_create(struct crypto_template *tmpl, struct rtattr **tb) 
	if ((algt->type ^ CRYPTO_ALG_TYPE_AKCIPHER) & algt->mask)

		return -EINVAL;



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



	rsa_alg_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(rsa_alg_name))

		return PTR_ERR(rsa_alg_name);
@@ -636,9 +639,8 @@ static int pkcs1pad_create(struct crypto_template *tmpl, struct rtattr **tb) 
	spawn = &ctx->spawn;

	ctx->digest_info = digest_info;



	crypto_set_spawn(&spawn->base, akcipher_crypto_instance(inst));

	err = crypto_grab_akcipher(spawn, rsa_alg_name, 0,

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

	err = crypto_grab_akcipher(spawn, akcipher_crypto_instance(inst),

				   rsa_alg_name, 0, mask);

	if (err)

		goto out_free_inst;

include/crypto/internal/akcipher.h

+3 −9
Original line number Diff line number Diff line
@@ -78,15 +78,9 @@ static inline void *akcipher_instance_ctx(struct akcipher_instance *inst) 
	return crypto_instance_ctx(akcipher_crypto_instance(inst));

}



static inline void crypto_set_akcipher_spawn(

		struct crypto_akcipher_spawn *spawn,

		struct crypto_instance *inst)

{

	crypto_set_spawn(&spawn->base, inst);

}



int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn, const char *name,

		u32 type, u32 mask);

int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn,

			 struct crypto_instance *inst,

			 const char *name, u32 type, u32 mask);



static inline struct crypto_akcipher *crypto_spawn_akcipher(

		struct crypto_akcipher_spawn *spawn)