summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-04-09 17:40:35 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-04-10 21:39:24 +0800
commite9b8e5beb7befe682f9fe90428ea534b01d66568 (patch)
treef3592cb3e6f31960257ca0e83765241eef219adb /crypto
parent1711045fb11b4aa9afda066ce5fe68b2345d52c5 (diff)
downloadlinux-e9b8e5beb7befe682f9fe90428ea534b01d66568.tar.gz
linux-e9b8e5beb7befe682f9fe90428ea534b01d66568.tar.bz2
linux-e9b8e5beb7befe682f9fe90428ea534b01d66568.zip
crypto: api - Move alg ref count init to crypto_check_alg
We currently initialise the crypto_alg ref count in the function __crypto_register_alg. As one of the callers of that function crypto_register_instance needs to obtain a ref count before it calls __crypto_register_alg, we need to move the initialisation out of there. Since both callers of __crypto_register_alg call crypto_check_alg, this is the logical place to perform the initialisation. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Stephan Mueller <smueller@chronox.de>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algapi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c
index f1d0307b1d08..1462c68492ea 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -64,6 +64,8 @@ static int crypto_check_alg(struct crypto_alg *alg)
if (alg->cra_priority < 0)
return -EINVAL;
+ atomic_set(&alg->cra_refcnt, 1);
+
return crypto_set_driver_name(alg);
}
@@ -187,7 +189,6 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
ret = -EEXIST;
- atomic_set(&alg->cra_refcnt, 1);
list_for_each_entry(q, &crypto_alg_list, cra_list) {
if (q == alg)
goto err;