1 files changed, 32 insertions, 27 deletions

diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index c0b3030b5634..835c1ab30d01 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -9,6 +9,7 @@
  * 2 of the Licence, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) "big_key: "fmt
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <linux/file.h>
@@ -341,44 +342,48 @@ error:
  */
 static int __init big_key_init(void)
 {
-        return register_key_type(&key_type_big_key);
-}
-
-/*
- * Initialize big_key crypto and RNG algorithms
- */
-static int __init big_key_crypto_init(void)
-{
-        int ret = -EINVAL;
+        struct crypto_skcipher *cipher;
+        struct crypto_rng *rng;
+        int ret;
 
-        /* init RNG */
-        big_key_rng = crypto_alloc_rng(big_key_rng_name, 0, 0);
-        if (IS_ERR(big_key_rng)) {
-                big_key_rng = NULL;
-                return -EFAULT;
+        rng = crypto_alloc_rng(big_key_rng_name, 0, 0);
+        if (IS_ERR(rng)) {
+                pr_err("Can't alloc rng: %ld\n", PTR_ERR(rng));
+                return PTR_ERR(rng);
         }
 
+        big_key_rng = rng;
+
         /* seed RNG */
-        ret = crypto_rng_reset(big_key_rng, NULL, crypto_rng_seedsize(big_key_rng));
-        if (ret)
-                goto error;
+        ret = crypto_rng_reset(rng, NULL, crypto_rng_seedsize(rng));
+        if (ret) {
+                pr_err("Can't reset rng: %d\n", ret);
+                goto error_rng;
+        }
 
         /* init block cipher */
-        big_key_skcipher = crypto_alloc_skcipher(big_key_alg_name,
-                                                 0, CRYPTO_ALG_ASYNC);
-        if (IS_ERR(big_key_skcipher)) {
-                big_key_skcipher = NULL;
-                ret = -EFAULT;
-                goto error;
+        cipher = crypto_alloc_skcipher(big_key_alg_name, 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(cipher)) {
+                ret = PTR_ERR(cipher);
+                pr_err("Can't alloc crypto: %d\n", ret);
+                goto error_rng;
+        }
+
+        big_key_skcipher = cipher;
+
+        ret = register_key_type(&key_type_big_key);
+        if (ret < 0) {
+                pr_err("Can't register type: %d\n", ret);
+                goto error_cipher;
         }
 
         return 0;
 
-error:
+error_cipher:
+        crypto_free_skcipher(big_key_skcipher);
+error_rng:
         crypto_free_rng(big_key_rng);
-        big_key_rng = NULL;
         return ret;
 }
 
-device_initcall(big_key_init);
-late_initcall(big_key_crypto_init);
+late_initcall(big_key_init);