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

2 files changed, 7 insertions, 11 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;
diff --git a/crypto/authenc.c b/crypto/authenc.c
index 0b29a6ae673d..126a529b496d 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -84,8 +84,8 @@ static int crypto_authenc_hash(struct aead_request *req)
                 .tfm = auth,
         };
         u8 *hash = aead_request_ctx(req);
-        struct scatterlist *dst;
-        unsigned int cryptlen;
+        struct scatterlist *dst = req->dst;
+        unsigned int cryptlen = req->cryptlen;
         int err;
 
         hash = (u8 *)ALIGN((unsigned long)hash + crypto_hash_alignmask(auth), 
@@ -100,8 +100,6 @@ static int crypto_authenc_hash(struct aead_request *req)
         if (err)
                 goto auth_unlock;
 
-        cryptlen = req->cryptlen;
-        dst = req->dst;
         err = crypto_hash_update(&desc, dst, cryptlen);
         if (err)
                 goto auth_unlock;
@@ -159,8 +157,8 @@ static int crypto_authenc_verify(struct aead_request *req)
         };
         u8 *ohash = aead_request_ctx(req);
         u8 *ihash;
-        struct scatterlist *src;
-        unsigned int cryptlen;
+        struct scatterlist *src = req->src;
+        unsigned int cryptlen = req->cryptlen;
         unsigned int authsize;
         int err;
 
@@ -177,8 +175,6 @@ static int crypto_authenc_verify(struct aead_request *req)
         if (err)
                 goto auth_unlock;
 
-        cryptlen = req->cryptlen;
-        src = req->src;
         err = crypto_hash_update(&desc, src, cryptlen);
         if (err)
                 goto auth_unlock;