aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/api.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/api.c b/crypto/api.c
index 3b6180336d3d..37c4c7213de0 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -34,6 +34,8 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem);
34BLOCKING_NOTIFIER_HEAD(crypto_chain); 34BLOCKING_NOTIFIER_HEAD(crypto_chain);
35EXPORT_SYMBOL_GPL(crypto_chain); 35EXPORT_SYMBOL_GPL(crypto_chain);
36 36
37static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
38
37struct crypto_alg *crypto_mod_get(struct crypto_alg *alg) 39struct crypto_alg *crypto_mod_get(struct crypto_alg *alg)
38{ 40{
39 return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL; 41 return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL;
@@ -144,8 +146,11 @@ static struct crypto_alg *crypto_larval_add(const char *name, u32 type,
144 } 146 }
145 up_write(&crypto_alg_sem); 147 up_write(&crypto_alg_sem);
146 148
147 if (alg != &larval->alg) 149 if (alg != &larval->alg) {
148 kfree(larval); 150 kfree(larval);
151 if (crypto_is_larval(alg))
152 alg = crypto_larval_wait(alg);
153 }
149 154
150 return alg; 155 return alg;
151} 156}