From: Thomas Gleixner Date: Wed, 6 Nov 2019 21:55:40 +0000 (+0100) Subject: futex: Set task::futex_state to DEAD right after handling futex exit X-Git-Tag: v4.19.172~20 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8f9a98a0e00ad101e2301ebb78d8537133e39ceb;p=users%2Fdwmw2%2Flinux.git 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 Reviewed-by: Ingo Molnar Acked-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20191106224556.439511191@linutronix.de Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/exit.c b/kernel/exit.c index 38de88f8f75da..d6c250f579775 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -909,7 +909,6 @@ void __noreturn 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 6f00ce1c679e0..ac1fe4c5f2319 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3719,6 +3719,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,