Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2007-11-26 20:08:42 -08:00
commit 8912858bcb
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/algapi.c
View file

@ -95,6 +95,9 @@ static void crypto_remove_spawn(struct crypto_spawn *spawn,
return; return;
inst->alg.cra_flags |= CRYPTO_ALG_DEAD; inst->alg.cra_flags |= CRYPTO_ALG_DEAD;
if (hlist_unhashed(&inst->list))
return;
if (!tmpl || !crypto_tmpl_get(tmpl)) if (!tmpl || !crypto_tmpl_get(tmpl))
return; return;
@ -335,9 +338,6 @@ int crypto_register_instance(struct crypto_template *tmpl,
LIST_HEAD(list); LIST_HEAD(list);
int err = -EINVAL; int err = -EINVAL;
if (inst->alg.cra_destroy)
goto err;
err = crypto_check_alg(&inst->alg); err = crypto_check_alg(&inst->alg);
if (err) if (err)
goto err; goto err;

12
crypto/authenc.c
View file

@ -84,8 +84,8 @@ static int crypto_authenc_hash(struct aead_request *req)
.tfm = auth, .tfm = auth,
}; };
u8 *hash = aead_request_ctx(req); u8 *hash = aead_request_ctx(req);
struct scatterlist *dst; struct scatterlist *dst = req->dst;
unsigned int cryptlen; unsigned int cryptlen = req->cryptlen;
int err; int err;
hash = (u8 *)ALIGN((unsigned long)hash + crypto_hash_alignmask(auth), 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) if (err)
goto auth_unlock; goto auth_unlock;
cryptlen = req->cryptlen;
dst = req->dst;
err = crypto_hash_update(&desc, dst, cryptlen); err = crypto_hash_update(&desc, dst, cryptlen);
if (err) if (err)
goto auth_unlock; goto auth_unlock;
@ -159,8 +157,8 @@ static int crypto_authenc_verify(struct aead_request *req)
}; };
u8 *ohash = aead_request_ctx(req); u8 *ohash = aead_request_ctx(req);
u8 *ihash; u8 *ihash;
struct scatterlist *src; struct scatterlist *src = req->src;
unsigned int cryptlen; unsigned int cryptlen = req->cryptlen;
unsigned int authsize; unsigned int authsize;
int err; int err;
@ -177,8 +175,6 @@ static int crypto_authenc_verify(struct aead_request *req)
if (err) if (err)
goto auth_unlock; goto auth_unlock;
cryptlen = req->cryptlen;
src = req->src;
err = crypto_hash_update(&desc, src, cryptlen); err = crypto_hash_update(&desc, src, cryptlen);
if (err) if (err)
goto auth_unlock; goto auth_unlock;