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
This commit is contained in:
commit
48d2268473
1 changed files with 1 additions and 5 deletions
|
@ -2977,11 +2977,7 @@ static int selinux_task_prctl(int option,
|
||||||
|
|
||||||
static int selinux_task_wait(struct task_struct *p)
|
static int selinux_task_wait(struct task_struct *p)
|
||||||
{
|
{
|
||||||
u32 perm;
|
return task_has_perm(p, current, PROCESS__SIGCHLD);
|
||||||
|
|
||||||
perm = signal_to_av(p->exit_signal);
|
|
||||||
|
|
||||||
return task_has_perm(p, current, perm);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void selinux_task_reparent_to_init(struct task_struct *p)
|
static void selinux_task_reparent_to_init(struct task_struct *p)
|
||||||
|
|
Loading…
Reference in a new issue