forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
a24a1fd731
commit
d4fdc2dfaa
|
@ -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,
|
||||||
{
|
{
|
||||||
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);
|
||||||
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,
|
||||||
{
|
{
|
||||||
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,
|
||||||
{
|
{
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user