From df70b187c9908155ba646b57797c2c6e7b426733 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 29 Nov 2007 23:07:57 +1100 Subject: [PATCH] CRYPTO api: Fix potential race in crypto_remove_spawn [CRYPTO] api: Fix potential race in crypto_remove_spawn [ Upstream commit: 38cb2419f544ad413c7f7aa8c17fd7377610cdd8 ] 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 Cc: David Miller Signed-off-by: Greg Kroah-Hartman --- crypto/algapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/algapi.c b/crypto/algapi.c index 38aa9e994703..3798ebdcf40c 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -98,6 +98,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; @@ -333,9 +336,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; -- 2.39.5