keys: use keyring_alloc() to create module signing keyring

Use keyring_alloc() to create special keyrings now that it has
a permissions parameter rather than using key_alloc() +
key_instantiate_and_link().

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/modsign_pubkey.c b/kernel/modsign_pubkey.c
index 045504fffbb2657bd81f9c1165941edc19a8dce1..2b6e69909c394440b015e771ff0f3f4eab1a1a28 100644 (file)
--- a/kernel/modsign_pubkey.c
+++ b/kernel/modsign_pubkey.c
@@ -34,18 +34,15 @@ static __init int module_verify_init(void)
 {
        pr_notice("Initialise module verification\n");
 
-       modsign_keyring = key_alloc(&key_type_keyring, ".module_sign",
-                                   KUIDT_INIT(0), KGIDT_INIT(0),
-                                   current_cred(),
-                                   (KEY_POS_ALL & ~KEY_POS_SETATTR) |
-                                   KEY_USR_VIEW | KEY_USR_READ,
-                                   KEY_ALLOC_NOT_IN_QUOTA);
+       modsign_keyring = keyring_alloc(".module_sign",
+                                       KUIDT_INIT(0), KGIDT_INIT(0),
+                                       current_cred(),
+                                       ((KEY_POS_ALL & ~KEY_POS_SETATTR) |
+                                        KEY_USR_VIEW | KEY_USR_READ),
+                                       KEY_ALLOC_NOT_IN_QUOTA, NULL);
        if (IS_ERR(modsign_keyring))
                panic("Can't allocate module signing keyring\n");
 
-       if (key_instantiate_and_link(modsign_keyring, NULL, 0, NULL, NULL) < 0)
-               panic("Can't instantiate module signing keyring\n");
-
        return 0;
 }