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().

David Howells committed 13 years ago

Commit cfde8191 parent e67eab31 file · +6 −9Browse files

Unified · Split

@@ -34,18 +34,15 @@ static __init int module_verify_init(void) · 33 unmodified lines
34	{	34	{
35	pr_notice("Initialise module verification\n");	35	pr_notice("Initialise module verification\n");
36		36
37	modsign_keyring = key_alloc(&key_type_keyring, ".module_sign",	37	modsign_keyring = keyring_alloc(".module_sign",
38	KUIDT_INIT(0), KGIDT_INIT(0),	38	KUIDT_INIT(0), KGIDT_INIT(0),
39	current_cred(),	39	current_cred(),
40	(KEY_POS_ALL & ~KEY_POS_SETATTR) \|	40	((KEY_POS_ALL & ~KEY_POS_SETATTR) \|
41	KEY_USR_VIEW \| KEY_USR_READ,	41	KEY_USR_VIEW \| KEY_USR_READ),
42	KEY_ALLOC_NOT_IN_QUOTA);	42	KEY_ALLOC_NOT_IN_QUOTA, NULL);
43	if (IS_ERR(modsign_keyring))	43	if (IS_ERR(modsign_keyring))
44	panic("Can't allocate module signing keyring\n");	44	panic("Can't allocate module signing keyring\n");
45		45
46	if (key_instantiate_and_link(modsign_keyring, NULL, 0, NULL, NULL) < 0)
47	panic("Can't instantiate module signing keyring\n");
48
49	return 0;	46	return 0;
50	}	47	}
51		48