iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

futex: Sanitize exit state handling

Browse Source 
Instead of having a smp_mb() and an empty lock/unlock of task::pi_lock move
the state setting into to the lock section.

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.645603214@linutronix.de
This commit is contained in:
Thomas Gleixner 2019-11-06 22:55:42 +01:00
parent 18f694385c
commit 4a8e991b91
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/futex.c
View File

@ -3703,16 +3703,19 @@ void futex_exit_recursive(struct task_struct *tsk)
void futex_exit_release(struct task_struct *tsk) void futex_exit_release(struct task_struct *tsk)
{ {
tsk->futex_state = FUTEX_STATE_EXITING;
/* /*
* Ensure that all new tsk->pi_lock acquisitions must observe * Switch the state to FUTEX_STATE_EXITING under tsk->pi_lock.
* FUTEX_STATE_EXITING. Serializes against attach_to_pi_owner(). *
*/ * This ensures that all subsequent checks of tsk->futex_state in
smp_mb(); * attach_to_pi_owner() must observe FUTEX_STATE_EXITING with
/* * tsk->pi_lock held.
* Ensure that we must observe the pi_state in exit_pi_state_list(). *
* It guarantees also that a pi_state which was queued right before
* the state change under tsk->pi_lock by a concurrent waiter must
* be observed in exit_pi_state_list().
*/ */
raw_spin_lock_irq(&tsk->pi_lock); raw_spin_lock_irq(&tsk->pi_lock);
tsk->futex_state = FUTEX_STATE_EXITING;
raw_spin_unlock_irq(&tsk->pi_lock); raw_spin_unlock_irq(&tsk->pi_lock);
futex_exec_release(tsk); futex_exec_release(tsk);