The patch titled
Subject: keys: use keyring_alloc() to create module signing keyring
has been added to the -mm tree. Its filename is
keys-use-keyring_alloc-to-create-module-signing-keyring.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: David Howells <dhowells@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/modsign_pubkey.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff -puN kernel/modsign_pubkey.c~keys-use-keyring_alloc-to-create-module-signing-keyring kernel/modsign_pubkey.c
--- a/kernel/modsign_pubkey.c~keys-use-keyring_alloc-to-create-module-signing-keyring
+++ a/kernel/modsign_pubkey.c
@@ -34,18 +34,15 @@ static __init int module_verify_init(voi
{
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;
}
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
origin.patch
linux-next.patch
checkpatch-warn-on-uapi-includes-that-include-uapi.patch
keys-fix-unreachable-code.patch
keys-use-keyring_alloc-to-create-module-signing-keyring.patch
mutex-subsystem-synchro-test-module.patch
mutex-subsystem-synchro-test-module-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
