crypto: algapi - enforce that all instances have a ->free() method

All instances need to have a ->free() method, but people could forget to
set it and then not notice if the instance is never unregistered.  To
help detect this bug earlier, don't allow an instance without a ->free()
method to be registered, and complain loudly if someone tries to do it.

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

diff --git a/crypto/aead.c b/crypto/aead.c
index 7707d322310171bed8a21c4aaa025dfc0935ed0b..16991095270d2f6777a875d1417b07d92506b039 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -288,6 +288,9 @@ int aead_register_instance(struct crypto_template *tmpl,
 {
        int err;
 
+       if (WARN_ON(!inst->free))
+               return -EINVAL;
+
        err = aead_prepare_alg(&inst->alg);
        if (err)
                return err;

diff --git a/crypto/ahash.c b/crypto/ahash.c
index cd5d9847d513a7751cf6c82fa837ef61c35f3c55..68a0f0cb75c4ce6a92ac399bfa244aa64a0cc190 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -656,6 +656,9 @@ int ahash_register_instance(struct crypto_template *tmpl,
 {
        int err;
 
+       if (WARN_ON(!inst->free))
+               return -EINVAL;
+
        err = ahash_prepare_alg(&inst->alg);
        if (err)
                return err;

diff --git a/crypto/akcipher.c b/crypto/akcipher.c
index eeed6c151d2f931e079596ee02ac721133585fb1..f866085c8a4a38e83e94bb64efcaa80e5e7eff73 100644 (file)
--- a/crypto/akcipher.c
+++ b/crypto/akcipher.c
@@ -147,6 +147,8 @@ EXPORT_SYMBOL_GPL(crypto_unregister_akcipher);
 int akcipher_register_instance(struct crypto_template *tmpl,
                               struct akcipher_instance *inst)
 {
+       if (WARN_ON(!inst->free))
+               return -EINVAL;
        akcipher_prepare_alg(&inst->alg);
        return crypto_register_instance(tmpl, akcipher_crypto_instance(inst));
 }

diff --git a/crypto/shash.c b/crypto/shash.c
index 70faf28b2d14adaa8d3ee32b6fff6483e4ce4de9..c075b26c2a1d9f034f89e8300fea679f65882991 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -577,6 +577,9 @@ int shash_register_instance(struct crypto_template *tmpl,
 {
        int err;
 
+       if (WARN_ON(!inst->free))
+               return -EINVAL;
+
        err = shash_prepare_alg(&inst->alg);
        if (err)
                return err;

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 42add1e0814ffa5bec1329ea130cef9c1d6a57aa..7221def7b9a7ff4bd2b3a96d53b162cd8d10d5bf 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -865,6 +865,9 @@ int skcipher_register_instance(struct crypto_template *tmpl,
 {
        int err;
 
+       if (WARN_ON(!inst->free))
+               return -EINVAL;
+
        err = skcipher_prepare_alg(&inst->alg);
        if (err)
                return err;