aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/hooks.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r--security/selinux/hooks.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 79c16e31c884..13384fef0d60 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4264,7 +4264,8 @@ static int selinux_setprocattr(struct task_struct *p,
4264 4264
4265#ifdef CONFIG_KEYS 4265#ifdef CONFIG_KEYS
4266 4266
4267static int selinux_key_alloc(struct key *k, struct task_struct *tsk) 4267static int selinux_key_alloc(struct key *k, struct task_struct *tsk,
4268 unsigned long flags)
4268{ 4269{
4269 struct task_security_struct *tsec = tsk->security; 4270 struct task_security_struct *tsec = tsk->security;
4270 struct key_security_struct *ksec; 4271 struct key_security_struct *ksec;
@@ -4513,8 +4514,10 @@ static __init int selinux_init(void)
4513 4514
4514#ifdef CONFIG_KEYS 4515#ifdef CONFIG_KEYS
4515 /* Add security information to initial keyrings */ 4516 /* Add security information to initial keyrings */
4516 security_key_alloc(&root_user_keyring, current); 4517 security_key_alloc(&root_user_keyring, current,
4517 security_key_alloc(&root_session_keyring, current); 4518 KEY_ALLOC_NOT_IN_QUOTA);
4519 security_key_alloc(&root_session_keyring, current,
4520 KEY_ALLOC_NOT_IN_QUOTA);
4518#endif 4521#endif
4519 4522
4520 return 0; 4523 return 0;