summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-17 22:09:38 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2007-11-23 19:32:09 +0800
commit38cb2419f544ad413c7f7aa8c17fd7377610cdd8 (patch)
treef54bcb1294d2f8dfe87d42cb3603c4dd4ac13d74 /crypto
parentf347c4facfee3d11eb9cd1c070ab471a8fb7401e (diff)
downloadlinux-3.10-38cb2419f544ad413c7f7aa8c17fd7377610cdd8.tar.gz
linux-3.10-38cb2419f544ad413c7f7aa8c17fd7377610cdd8.tar.bz2
linux-3.10-38cb2419f544ad413c7f7aa8c17fd7377610cdd8.zip
[CRYPTO] api: Fix potential race in crypto_remove_spawn
As it is crypto_remove_spawn may try to unregister an instance which is yet to be registered. This patch fixes this by checking whether the instance has been registered before attempting to remove it. It also removes a bogus cra_destroy check in crypto_register_instance as 1) it's outside the mutex; 2) we have a check in __crypto_register_alg already. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algapi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c
index 8ff8c2656d9..8383282de1d 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;