1 files changed, 9 insertions, 2 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 2255dc72deef..955a8eb66d70 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -50,6 +50,7 @@
 #include <linux/tsacct_kern.h>
 #include <linux/cn_proc.h>
 #include <linux/audit.h>
+#include <linux/signalfd.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -582,6 +583,13 @@ static int de_thread(struct task_struct *tsk)
         int count;
 
         /*
+         * Tell all the sighand listeners that this sighand has
+         * been detached. The signalfd_detach() function grabs the
+         * sighand lock, if signal listeners are present on the sighand.
+         */
+        signalfd_detach(tsk);
+
+        /*
          * If we don't share sighandlers, then we aren't sharing anything
          * and we can just re-use it all.
          */
@@ -757,8 +765,7 @@ no_thread_group:
                 spin_unlock(&oldsighand->siglock);
                 write_unlock_irq(&tasklist_lock);
 
-                if (atomic_dec_and_test(&oldsighand->count))
-                        kmem_cache_free(sighand_cachep, oldsighand);
+                __cleanup_sighand(oldsighand);
         }
 
         BUG_ON(!thread_group_leader(tsk));