5 files changed, 11 insertions, 8 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 620e14cabd..4ca0ab3448 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -271,7 +271,7 @@ config CRYPTO_SERPENT
 
           Keys are allowed to be from 0 to 256 bits in length, in steps
           of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
-          variant of Serpent for compatibility with old kerneli code.
+          variant of Serpent for compatibility with old kerneli.org code.
 
           See also:
           <http://www.cl.cam.ac.uk/~rja14/serpent.html>
diff --git a/crypto/api.c b/crypto/api.c
index 55af8bb0f0..33734fd919 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -48,8 +48,10 @@ EXPORT_SYMBOL_GPL(crypto_mod_get);
 
 void crypto_mod_put(struct crypto_alg *alg)
 {
+        struct module *module = alg->cra_module;
+
         crypto_alg_put(alg);
-        module_put(alg->cra_module);
+        module_put(module);
 }
 EXPORT_SYMBOL_GPL(crypto_mod_put);
 
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 3ff4e1f0f0..ac6dce2e75 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -298,7 +298,7 @@ static inline int cryptd_create_thread(struct cryptd_state *state,
         mutex_init(&state->mutex);
         crypto_init_queue(&state->queue, CRYPTD_MAX_QLEN);
 
-        state->task = kthread_create(fn, state, name);
+        state->task = kthread_run(fn, state, name);
         if (IS_ERR(state->task))
                 return PTR_ERR(state->task);
 
@@ -316,6 +316,8 @@ static int cryptd_thread(void *data)
         struct cryptd_state *state = data;
         int stop;
 
+        current->flags |= PF_NOFREEZE;
+
         do {
                 struct crypto_async_request *req, *backlog;
 
diff --git a/crypto/cryptomgr.c b/crypto/cryptomgr.c
index 6958ea83ee..e5fb7cca51 100644
--- a/crypto/cryptomgr.c
+++ b/crypto/cryptomgr.c
@@ -24,8 +24,6 @@
 #include "internal.h"
 
 struct cryptomgr_param {
-        struct task_struct *thread;
-
         struct rtattr *tb[CRYPTOA_MAX];
 
         struct {
@@ -81,6 +79,7 @@ err:
 
 static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 {
+        struct task_struct *thread;
         struct cryptomgr_param *param;
         const char *name = larval->alg.cra_name;
         const char *p;
@@ -130,8 +129,8 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 
         memcpy(param->larval.name, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);
 
-        param->thread = kthread_run(cryptomgr_probe, param, "cryptomgr");
-        if (IS_ERR(param->thread))
+        thread = kthread_run(cryptomgr_probe, param, "cryptomgr");
+        if (IS_ERR(thread))
                 goto err_free_param;
 
         return NOTIFY_STOP;
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index f0aed0106a..11f9359538 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -691,7 +691,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
                         if (ret)
                                 goto out;
                 }
-                crypto_hash_final(desc, out);
+                ret = crypto_hash_final(desc, out);
                 if (ret)
                         goto out;
         }