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

+1 -5
+1 -5
security/selinux/hooks.c
··· 2977 2978 static int selinux_task_wait(struct task_struct *p) 2979 { 2980 - u32 perm; 2981 - 2982 - perm = signal_to_av(p->exit_signal); 2983 - 2984 - return task_has_perm(p, current, perm); 2985 } 2986 2987 static void selinux_task_reparent_to_init(struct task_struct *p)
··· 2977 2978 static int selinux_task_wait(struct task_struct *p) 2979 { 2980 + return task_has_perm(p, current, PROCESS__SIGCHLD); 2981 } 2982 2983 static void selinux_task_reparent_to_init(struct task_struct *p)