Merge tag 'v3.10.98' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / modsign_pubkey.c

diff --git a/kernel/modsign_pubkey.c b/kernel/modsign_pubkey.c
index 767e559dfb10e697d207cdc1dedca0b00d5b5bdf..2b6e69909c394440b015e771ff0f3f4eab1a1a28 100644 (file)
--- a/kernel/modsign_pubkey.c
+++ b/kernel/modsign_pubkey.c
@@ -20,12 +20,6 @@ struct key *modsign_keyring;
 
 extern __initdata const u8 modsign_certificate_list[];
 extern __initdata const u8 modsign_certificate_list_end[];
-asm(".section .init.data,\"aw\"\n"
-    SYMBOL_PREFIX "modsign_certificate_list:\n"
-    ".incbin \"signing_key.x509\"\n"
-    ".incbin \"extra_certificates\"\n"
-    SYMBOL_PREFIX "modsign_certificate_list_end:"
-    );
 
 /*
  * We need to make sure ccache doesn't cache the .o file as it doesn't notice
@@ -40,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;
 }