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: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/ccm.c b/crypto/ccm.c
index f4abaefd9df5bec7c9f4af37ccf24187458ffd1e..241ecdc5c4e0e6f111b41eb5576368bb6d753b60 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -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",

diff --git a/crypto/cmac.c b/crypto/cmac.c
index 58dc644416bb833e7470c5b8c3982f453e8fe2da..143a6544c873f53b4803091cec4502fc630fd1a8 100644 (file)
--- a/crypto/cmac.c
+++ b/crypto/cmac.c
@@ -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,
 };
 

diff --git a/crypto/hmac.c b/crypto/hmac.c
index 0a42b7075763cc12e4c4fee2602783ffc0dcbd43..e38bfb948278458bdd11d983d0424b03f4a362b5 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -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,
 };
 

diff --git a/crypto/shash.c b/crypto/shash.c
index 2f6adb49727bc1ca1385f4952aa850533f81d019..e05e75b0f402cad3373399edd4094dd1f66d76b8 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -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");

diff --git a/crypto/vmac.c b/crypto/vmac.c
index 28358a6aef9f96bb7b5a768d5a17e50f124f7fd9..2d906830df96df633fb09a22169dd80d68fa704f 100644 (file)
--- a/crypto/vmac.c
+++ b/crypto/vmac.c
@@ -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,
 };
 

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 9265e00ea663c493d510f00cc492f0ca9b0d53cc..598ec88abf0f9f6945a2bccdb82d2a5cbaeba529 100644 (file)
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -239,10 +239,12 @@ static int xcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
        inst->alg.final = crypto_xcbc_digest_final;
        inst->alg.setkey = crypto_xcbc_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;
 }
@@ -250,7 +252,6 @@ err_free_inst:
 static struct crypto_template crypto_xcbc_tmpl = {
        .name = "xcbc",
        .create = xcbc_create,
-       .free = shash_free_instance,
        .module = THIS_MODULE,
 };
 

diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index c550386221bb3f55a9a8b02f2ca381bda24ed3ed..89f6f46ab2b8bd70e21a536962bbc7614ab217e0 100644 (file)
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -125,7 +125,7 @@ int crypto_register_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,
                            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,
                      struct crypto_instance *inst,