commit e70da5634835ecd8abb68d14cfc27384d01dd201
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Aug 30 21:55:37 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Aug 30 21:55:37 2007 -0700
tree 97905add436c2ffdb83c60e87e4e85075813cabd
parent 644b55ce889edd37d6406df26e2d96d7a7390749
parent 4ac212ad4e8fafc22fa147fc255ff5fa5435cf33

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

security/selinux/hooks.c

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 @@
 		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