Commit d4fdc2df authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a24a1fd7
...@@ -288,6 +288,9 @@ int aead_register_instance(struct crypto_template *tmpl, ...@@ -288,6 +288,9 @@ int aead_register_instance(struct crypto_template *tmpl,
{ {
int err; int err;
if (WARN_ON(!inst->free))
return -EINVAL;
err = aead_prepare_alg(&inst->alg); err = aead_prepare_alg(&inst->alg);
if (err) if (err)
return err; return err;
......
...@@ -656,6 +656,9 @@ int ahash_register_instance(struct crypto_template *tmpl, ...@@ -656,6 +656,9 @@ int ahash_register_instance(struct crypto_template *tmpl,
{ {
int err; int err;
if (WARN_ON(!inst->free))
return -EINVAL;
err = ahash_prepare_alg(&inst->alg); err = ahash_prepare_alg(&inst->alg);
if (err) if (err)
return err; return err;
......
...@@ -147,6 +147,8 @@ EXPORT_SYMBOL_GPL(crypto_unregister_akcipher); ...@@ -147,6 +147,8 @@ EXPORT_SYMBOL_GPL(crypto_unregister_akcipher);
int akcipher_register_instance(struct crypto_template *tmpl, int akcipher_register_instance(struct crypto_template *tmpl,
struct akcipher_instance *inst) struct akcipher_instance *inst)
{ {
if (WARN_ON(!inst->free))
return -EINVAL;
akcipher_prepare_alg(&inst->alg); akcipher_prepare_alg(&inst->alg);
return crypto_register_instance(tmpl, akcipher_crypto_instance(inst)); return crypto_register_instance(tmpl, akcipher_crypto_instance(inst));
} }
......
...@@ -577,6 +577,9 @@ int shash_register_instance(struct crypto_template *tmpl, ...@@ -577,6 +577,9 @@ int shash_register_instance(struct crypto_template *tmpl,
{ {
int err; int err;
if (WARN_ON(!inst->free))
return -EINVAL;
err = shash_prepare_alg(&inst->alg); err = shash_prepare_alg(&inst->alg);
if (err) if (err)
return err; return err;
......
...@@ -865,6 +865,9 @@ int skcipher_register_instance(struct crypto_template *tmpl, ...@@ -865,6 +865,9 @@ int skcipher_register_instance(struct crypto_template *tmpl,
{ {
int err; int err;
if (WARN_ON(!inst->free))
return -EINVAL;
err = skcipher_prepare_alg(&inst->alg); err = skcipher_prepare_alg(&inst->alg);
if (err) if (err)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment