mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 09:31:50 +00:00
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: clear parent death signal on SID transitions
This commit is contained in:
commit
e70da56348
@ -1907,6 +1907,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
|
|||||||
spin_unlock_irq(¤t->sighand->siglock);
|
spin_unlock_irq(¤t->sighand->siglock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Always clear parent death signal on SID transitions. */
|
||||||
|
current->pdeath_signal = 0;
|
||||||
|
|
||||||
/* Check whether the new SID can inherit resource limits
|
/* Check whether the new SID can inherit resource limits
|
||||||
from the old SID. If not, reset all soft limits to
|
from the old SID. If not, reset all soft limits to
|
||||||
the lower of the current task's hard limit and the init
|
the lower of the current task's hard limit and the init
|
||||||
|
Loading…
Reference in New Issue
Block a user