Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

1 files changed, 8 insertions, 2 deletions

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index f474c608fa11..0d696431209c 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -325,8 +325,14 @@ static int __init init_ima(void)
 
         hash_setup(CONFIG_IMA_DEFAULT_HASH);
         error = ima_init();
-        if (!error)
-                ima_initialized = 1;
+        if (error)
+                goto out;
+
+        error = ima_init_keyring(INTEGRITY_KEYRING_IMA);
+        if (error)
+                goto out;
+        ima_initialized = 1;
+out:
         return error;
 }