1 files changed, 5 insertions, 0 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d8bc4172819c..0753b20e23fe 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -316,6 +316,7 @@ static inline int inode_doinit(struct inode *inode)
 }
 
 enum {
+        Opt_error = -1,
         Opt_context = 1,
         Opt_fscontext = 2,
         Opt_defcontext = 4,
@@ -327,6 +328,7 @@ static match_table_t tokens = {
         {Opt_fscontext, "fscontext=%s"},
         {Opt_defcontext, "defcontext=%s"},
         {Opt_rootcontext, "rootcontext=%s"},
+        {Opt_error, NULL},
 };
 
 #define SEL_MOUNT_FAIL_MSG "SELinux:  duplicate or incompatible mount options\n"
@@ -1907,6 +1909,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