crypto: aead - Add type-safe function for freeing instances

This patch adds a type-safe function for freeing AEAD instances
to struct aead_instance.  This replaces the existing free function
in struct crypto_template which does not know the type of the
instance that it's freeing.

Signed-off-by: Herbert Xu <[email protected]>

diff --git a/crypto/aead.c b/crypto/aead.c
index 07bf99773548bf9f088b6ff8380edb4caf7cda4a..8cd45a7eb7afb7d1a7095e625238cd99ef423b7a 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -307,9 +307,22 @@ static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)
        seq_printf(m, "geniv        : <none>\n");
 }
 
+static void crypto_aead_free_instance(struct crypto_instance *inst)
+{
+       struct aead_instance *aead = aead_instance(inst);
+
+       if (!aead->free) {
+               inst->tmpl->free(inst);
+               return;
+       }
+
+       aead->free(aead);
+}
+
 static const struct crypto_type crypto_new_aead_type = {
        .extsize = crypto_alg_extsize,
        .init_tfm = crypto_aead_init_tfm,
+       .free = crypto_aead_free_instance,
 #ifdef CONFIG_PROC_FS
        .show = crypto_aead_show,
 #endif

diff --git a/include/crypto/internal/aead.h b/include/crypto/internal/aead.h
index c3942f4d6e9f97883daf3e9726186835a4dc230e..a292e960fb33c4073576962d634ce6c7f36af475 100644 (file)
--- a/include/crypto/internal/aead.h
+++ b/include/crypto/internal/aead.h
@@ -21,6 +21,7 @@
 struct rtattr;
 
 struct aead_instance {
+       void (*free)(struct aead_instance *inst);
        union {
                struct {
                        char head[offsetof(struct aead_alg, base)];