Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 (e70da563) · Commits · e / devices / android_kernel_teracube_2e

security/selinux/hooks.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1907,6 +1907,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
	spin_unlock_irq(&current->sighand->siglock);		spin_unlock_irq(&current->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