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

crypto: shash - convert shash_free_instance() to new style 



Convert shash_free_instance() and its users to the new way of freeing
instances, where a ->free() method is installed to the instance struct
itself.  This replaces the weakly-typed method crypto_template::free().

This will allow removing support for the old way of freeing instances.

Also give shash_free_instance() a more descriptive name to reflect that
it's only for instances with a single spawn, not for any instance.

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

crypto/ccm.c

+3 −2
Original line number Diff line number Diff line
@@ -927,10 +927,12 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.final = crypto_cbcmac_digest_final;

	inst->alg.setkey = crypto_cbcmac_digest_setkey;



	inst->free = shash_free_singlespawn_instance;



	err = shash_register_instance(tmpl, inst);

	if (err) {

err_free_inst:

		shash_free_instance(shash_crypto_instance(inst));

		shash_free_singlespawn_instance(inst);

	}

	return err;

}
@@ -939,7 +941,6 @@ static struct crypto_template crypto_ccm_tmpls[] = { 
	{

		.name = "cbcmac",

		.create = cbcmac_create,

		.free = shash_free_instance,

		.module = THIS_MODULE,

	}, {

		.name = "ccm_base",

crypto/cmac.c

+3 −2
Original line number Diff line number Diff line
@@ -280,10 +280,12 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.final = crypto_cmac_digest_final;

	inst->alg.setkey = crypto_cmac_digest_setkey;



	inst->free = shash_free_singlespawn_instance;



	err = shash_register_instance(tmpl, inst);

	if (err) {

err_free_inst:

		shash_free_instance(shash_crypto_instance(inst));

		shash_free_singlespawn_instance(inst);

	}

	return err;

}
@@ -291,7 +293,6 @@ err_free_inst: 
static struct crypto_template crypto_cmac_tmpl = {

	.name = "cmac",

	.create = cmac_create,

	.free = shash_free_instance,

	.module = THIS_MODULE,

};

crypto/hmac.c

+3 −2
Original line number Diff line number Diff line
@@ -224,10 +224,12 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.init_tfm = hmac_init_tfm;

	inst->alg.exit_tfm = hmac_exit_tfm;



	inst->free = shash_free_singlespawn_instance;



	err = shash_register_instance(tmpl, inst);

	if (err) {

err_free_inst:

		shash_free_instance(shash_crypto_instance(inst));

		shash_free_singlespawn_instance(inst);

	}

	return err;

}
@@ -235,7 +237,6 @@ err_free_inst: 
static struct crypto_template hmac_tmpl = {

	.name = "hmac",

	.create = hmac_create,

	.free = shash_free_instance,

	.module = THIS_MODULE,

};

crypto/shash.c

+4 −4
Original line number Diff line number Diff line
@@ -590,12 +590,12 @@ int shash_register_instance(struct crypto_template *tmpl, 
}

EXPORT_SYMBOL_GPL(shash_register_instance);



void shash_free_instance(struct crypto_instance *inst)

void shash_free_singlespawn_instance(struct shash_instance *inst)

{

	crypto_drop_spawn(crypto_instance_ctx(inst));

	kfree(shash_instance(inst));

	crypto_drop_spawn(shash_instance_ctx(inst));

	kfree(inst);

}

EXPORT_SYMBOL_GPL(shash_free_instance);

EXPORT_SYMBOL_GPL(shash_free_singlespawn_instance);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Synchronous cryptographic hash type");

crypto/vmac.c

+3 −2
Original line number Diff line number Diff line
@@ -660,10 +660,12 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.final = vmac_final;

	inst->alg.setkey = vmac_setkey;



	inst->free = shash_free_singlespawn_instance;



	err = shash_register_instance(tmpl, inst);

	if (err) {

err_free_inst:

		shash_free_instance(shash_crypto_instance(inst));

		shash_free_singlespawn_instance(inst);

	}

	return err;

}
@@ -671,7 +673,6 @@ err_free_inst: 
static struct crypto_template vmac64_tmpl = {

	.name = "vmac64",

	.create = vmac_create,

	.free = shash_free_instance,

	.module = THIS_MODULE,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE