futex: Set task::futex_state to DEAD right after handling futex exit

commit f24f22435dcc11389acc87e5586239c1819d217c upstream.

Setting task::futex_state in do_exit() is rather arbitrarily placed for no
reason. Move it into the futex code.

Note, this is only done for the exit cleanup as the exec cleanup cannot set
the state to FUTEX_STATE_DEAD because the task struct is still in active
use.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191106224556.439511191@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/exit.c b/kernel/exit.c
index a098d76a9877ec8463195d2d806e2d67b5f68bd1..b39f4b3c0f37cbf850c656db0e1dae22451be607 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -784,7 +784,6 @@ void do_exit(long code)
         * Make sure we are holding no locks:
         */
        debug_check_no_locks_held();
-       futex_exit_done(tsk);
 
        if (tsk->io_context)
                exit_io_context(tsk);

diff --git a/kernel/futex.c b/kernel/futex.c
index 32a606b605cbbeaa70e19e2a3dc353aeb30b4479..f85635ff2fce1aed50b92c1ed300468ca6b4b9e5 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3255,6 +3255,7 @@ void futex_exec_release(struct task_struct *tsk)
 void futex_exit_release(struct task_struct *tsk)
 {
        futex_exec_release(tsk);
+       futex_exit_done(tsk);
 }
 
 long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,