]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
MODSIGN: Fix build error with strict typechecking
authorDavid Rientjes <rientjes@google.com>
Thu, 4 Oct 2012 13:22:21 +0000 (14:22 +0100)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 5 Oct 2012 03:31:05 +0000 (13:01 +0930)
"MODSIGN: Provide module signing public keys to the kernel" causes a build
error when CONFIG_UIDGID_STRICT_TYPE_CHECKS is enabled:

kernel/modsign_pubkey.c: In function 'module_verify_init':
kernel/modsign_pubkey.c:47: error: incompatible type for argument 3 of 'key_alloc'
include/linux/key.h:195: note: expected 'kuid_t' but argument is of type 'int'
kernel/modsign_pubkey.c:47: error: incompatible type for argument 4 of 'key_alloc'
include/linux/key.h:195: note: expected 'kgid_t' but argument is of type 'int'

Cast the parameters accordingly.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
kernel/modsign_pubkey.c

index f504d9f696137ebab4dc094cd46cf145ae0da44e..4646eb2c382011de7c051577d0fe8b590b4dddca 100644 (file)
@@ -41,7 +41,8 @@ static __init int module_verify_init(void)
        pr_notice("Initialise module verification\n");
 
        modsign_keyring = key_alloc(&key_type_keyring, ".module_sign",
-                                   0, 0, current_cred(),
+                                   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);