Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f9a98a0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191106224556.439511191@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1dd58934

kernel/exit.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

kernel/futex.c

+1 −0
Original line number Diff line number Diff line
@@ -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,