Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] api: Fix potential race in crypto_remove_spawn
  [CRYPTO] authenc: Move initialisations up to shut up gcc

1 files changed, 3 insertions, 3 deletions

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 8ff8c2656d9c..8383282de1dd 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -95,6 +95,9 @@ static void crypto_remove_spawn(struct crypto_spawn *spawn,
                 return;
 
         inst->alg.cra_flags |= CRYPTO_ALG_DEAD;
+        if (hlist_unhashed(&inst->list))
+                return;
+
         if (!tmpl || !crypto_tmpl_get(tmpl))
                 return;
 
@@ -335,9 +338,6 @@ int crypto_register_instance(struct crypto_template *tmpl,
         LIST_HEAD(list);
         int err = -EINVAL;
 
-        if (inst->alg.cra_destroy)
-                goto err;
-
         err = crypto_check_alg(&inst->alg);
         if (err)
                 goto err;