aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-23 11:59:46 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-23 11:59:46 -0400
commit48d2268473a66fe3aa78fb13b09ee59d6ee95073 (patch)
tree20d55db1f93294f006ce79156a05652dfa7a8048 /security
parente5eca6aef6a2a57e433db1eac247d2d1c213ce08 (diff)
parent8a53514043e380aa573baa805298a7727c993985 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: always check SIGCHLD in selinux_task_wait
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 24e1b1885de7..9f3124b08867 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2977,11 +2977,7 @@ static int selinux_task_prctl(int option,
2977 2977
2978static int selinux_task_wait(struct task_struct *p) 2978static int selinux_task_wait(struct task_struct *p)
2979{ 2979{
2980 u32 perm; 2980 return task_has_perm(p, current, PROCESS__SIGCHLD);
2981
2982 perm = signal_to_av(p->exit_signal);
2983
2984 return task_has_perm(p, current, perm);
2985} 2981}
2986 2982
2987static void selinux_task_reparent_to_init(struct task_struct *p) 2983static void selinux_task_reparent_to_init(struct task_struct *p)