1 files changed, 11 insertions, 1 deletions

diff --git a/fs/exec.c b/fs/exec.c
index c7f9b733406d..02bfd980a40c 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -926,10 +926,14 @@ static int de_thread(struct task_struct *tsk)
         if (!thread_group_leader(tsk)) {
                 struct task_struct *leader = tsk->group_leader;
 
-                sig->notify_count = -1; /* for exit_notify() */
                 for (;;) {
                         threadgroup_change_begin(tsk);
                         write_lock_irq(&tasklist_lock);
+                        /*
+                         * Do this under tasklist_lock to ensure that
+                         * exit_notify() can't miss ->group_exit_task
+                         */
+                        sig->notify_count = -1;
                         if (likely(leader->exit_state))
                                 break;
                         __set_current_state(TASK_KILLABLE);
@@ -1078,7 +1082,13 @@ int flush_old_exec(struct linux_binprm * bprm)
         if (retval)
                 goto out;
 
+        /*
+         * Must be called _before_ exec_mmap() as bprm->mm is
+         * not visibile until then. This also enables the update
+         * to be lockless.
+         */
         set_mm_exe_file(bprm->mm, bprm->file);
+
         /*
          * Release all of the old mmap stuff
          */