Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

e70da563 · Linus Torvalds <[email protected]> · 2007-08-30 21:55:37 -07:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: clear parent death signal on SID transitions

Merge commit. Changes below are compared with the first parent: 644b55ce.

Changes

1 files changed · +3 −0

File	Status	Add	Del	Content
security/selinux/hooks.c	modified	+3	−0	View file

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d8bc417..3694662 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1907,6 +1907,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
 		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
 	   from the old SID.  If not, reset all soft limits to
 	   the lower of the current task's hard limit and the init