AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

crypto: shash - convert shash_free_instance() to new style

Browse Source 
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: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2020-01-02 20:04:38 -08:00 committed by Herbert Xu
parent 758ec5ac5b
commit a39c66cc2f
7 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/ccm.c
View File

@ -927,10 +927,12 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.final = crypto_cbcmac_digest_final; inst->alg.final = crypto_cbcmac_digest_final;
inst->alg.setkey = crypto_cbcmac_digest_setkey; inst->alg.setkey = crypto_cbcmac_digest_setkey;
inst->free = shash_free_singlespawn_instance;
err = shash_register_instance(tmpl, inst); err = shash_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
shash_free_instance(shash_crypto_instance(inst)); shash_free_singlespawn_instance(inst);
} }
return err; return err;
} }
@ -939,7 +941,6 @@ static struct crypto_template crypto_ccm_tmpls[] = {
{ {
.name = "cbcmac", .name = "cbcmac",
.create = cbcmac_create, .create = cbcmac_create,
.free = shash_free_instance,
.module = THIS_MODULE, .module = THIS_MODULE,
}, { }, {
.name = "ccm_base", .name = "ccm_base",

5
crypto/cmac.c
View File

@ -280,10 +280,12 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.final = crypto_cmac_digest_final; inst->alg.final = crypto_cmac_digest_final;
inst->alg.setkey = crypto_cmac_digest_setkey; inst->alg.setkey = crypto_cmac_digest_setkey;
inst->free = shash_free_singlespawn_instance;
err = shash_register_instance(tmpl, inst); err = shash_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
shash_free_instance(shash_crypto_instance(inst)); shash_free_singlespawn_instance(inst);
} }
return err; return err;
} }
@ -291,7 +293,6 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
static struct crypto_template crypto_cmac_tmpl = { static struct crypto_template crypto_cmac_tmpl = {
.name = "cmac", .name = "cmac",
.create = cmac_create, .create = cmac_create,
.free = shash_free_instance,
.module = THIS_MODULE, .module = THIS_MODULE,
}; };

5
crypto/hmac.c
View File

@ -224,10 +224,12 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.init_tfm = hmac_init_tfm; inst->alg.init_tfm = hmac_init_tfm;
inst->alg.exit_tfm = hmac_exit_tfm; inst->alg.exit_tfm = hmac_exit_tfm;
inst->free = shash_free_singlespawn_instance;
err = shash_register_instance(tmpl, inst); err = shash_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
shash_free_instance(shash_crypto_instance(inst)); shash_free_singlespawn_instance(inst);
} }
return err; return err;
} }
@ -235,7 +237,6 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
static struct crypto_template hmac_tmpl = { static struct crypto_template hmac_tmpl = {
.name = "hmac", .name = "hmac",
.create = hmac_create, .create = hmac_create,
.free = shash_free_instance,
.module = THIS_MODULE, .module = THIS_MODULE,
}; };

8
crypto/shash.c
View File

@ -590,12 +590,12 @@ int shash_register_instance(struct crypto_template *tmpl,
} }
EXPORT_SYMBOL_GPL(shash_register_instance); 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)); crypto_drop_spawn(shash_instance_ctx(inst));
kfree(shash_instance(inst)); kfree(inst);
} }
EXPORT_SYMBOL_GPL(shash_free_instance); EXPORT_SYMBOL_GPL(shash_free_singlespawn_instance);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Synchronous cryptographic hash type"); MODULE_DESCRIPTION("Synchronous cryptographic hash type");

5
crypto/vmac.c
View File

@ -660,10 +660,12 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.final = vmac_final; inst->alg.final = vmac_final;
inst->alg.setkey = vmac_setkey; inst->alg.setkey = vmac_setkey;
inst->free = shash_free_singlespawn_instance;
err = shash_register_instance(tmpl, inst); err = shash_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
shash_free_instance(shash_crypto_instance(inst)); shash_free_singlespawn_instance(inst);
} }
return err; return err;
} }
@ -671,7 +673,6 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb)
static struct crypto_template vmac64_tmpl = { static struct crypto_template vmac64_tmpl = {
.name = "vmac64", .name = "vmac64",
.create = vmac_create, .create = vmac_create,
.free = shash_free_instance,
.module = THIS_MODULE, .module = THIS_MODULE,
}; };

5
crypto/xcbc.c
View File

@ -239,10 +239,12 @@ static int xcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.final = crypto_xcbc_digest_final; inst->alg.final = crypto_xcbc_digest_final;
inst->alg.setkey = crypto_xcbc_digest_setkey; inst->alg.setkey = crypto_xcbc_digest_setkey;
inst->free = shash_free_singlespawn_instance;
err = shash_register_instance(tmpl, inst); err = shash_register_instance(tmpl, inst);
if (err) { if (err) {
err_free_inst: err_free_inst:
shash_free_instance(shash_crypto_instance(inst)); shash_free_singlespawn_instance(inst);
} }
return err; return err;
} }
@ -250,7 +252,6 @@ static int xcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
static struct crypto_template crypto_xcbc_tmpl = { static struct crypto_template crypto_xcbc_tmpl = {
.name = "xcbc", .name = "xcbc",
.create = xcbc_create, .create = xcbc_create,
.free = shash_free_instance,
.module = THIS_MODULE, .module = THIS_MODULE,
}; };

2
include/crypto/internal/hash.h
View File

@ -125,7 +125,7 @@ int crypto_register_shashes(struct shash_alg *algs, int count);
void crypto_unregister_shashes(struct shash_alg *algs, int count); void crypto_unregister_shashes(struct shash_alg *algs, int count);
int shash_register_instance(struct crypto_template *tmpl, int shash_register_instance(struct crypto_template *tmpl,
struct shash_instance *inst); struct shash_instance *inst);
void shash_free_instance(struct crypto_instance *inst); void shash_free_singlespawn_instance(struct shash_instance *inst);
int crypto_grab_shash(struct crypto_shash_spawn *spawn, int crypto_grab_shash(struct crypto_shash_spawn *spawn,
struct crypto_instance *inst, struct crypto_instance *inst,