2 files changed, 12 insertions, 11 deletions

diff --git a/fs/exec.c b/fs/exec.c
index ce62f7b65f17..af4361c927a9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -780,18 +780,12 @@ 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.
          */
         if (atomic_read(&oldsighand->count) <= 1) {
                 BUG_ON(atomic_read(&sig->count) != 1);
+                signalfd_detach(tsk);
                 exit_itimers(sig);
                 return 0;
         }
@@ -930,6 +924,7 @@ static int de_thread(struct task_struct *tsk)
         sig->flags = 0;
 
 no_thread_group:
+        signalfd_detach(tsk);
         exit_itimers(sig);
         if (leader)
                 release_task(leader);
diff --git a/fs/signalfd.c b/fs/signalfd.c
index 7b941abbcde0..a8e293d30034 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -56,12 +56,18 @@ static int signalfd_lock(struct signalfd_ctx *ctx, struct signalfd_lockctx *lk)
                 sighand = lock_task_sighand(lk->tsk, &lk->flags);
         rcu_read_unlock();
 
-        if (sighand && !ctx->tsk) {
+        if (!sighand)
+                return 0;
+
+        if (!ctx->tsk) {
                 unlock_task_sighand(lk->tsk, &lk->flags);
-                sighand = NULL;
+                return 0;
         }
 
-        return sighand != NULL;
+        if (lk->tsk->tgid == current->tgid)
+                lk->tsk = current;
+
+        return 1;
 }
 
 static void signalfd_unlock(struct signalfd_lockctx *lk)
@@ -331,7 +337,7 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas
 
                 init_waitqueue_head(&ctx->wqh);
                 ctx->sigmask = sigmask;
-                ctx->tsk = current;
+                ctx->tsk = current->group_leader;
 
                 sighand = current->sighand;
                 /*