Skip to content

Commit 1e106aa

Browse files
Dan CarpenterKAGA-KOKO
authored andcommitted
futex: Don't enable IRQs unconditionally in put_pi_state()
The exit_pi_state_list() function calls put_pi_state() with IRQs disabled and is not expecting that IRQs will be enabled inside the function. Use the _irqsave() variant so that IRQs are restored to the original state instead of being enabled unconditionally. Fixes: 153fbd1 ("futex: Fix more put_pi_state() vs. exit_pi_state_list() races") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20201106085205.GA1159983@mwanda
1 parent f8394f2 commit 1e106aa

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

kernel/futex.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,16 +788,17 @@ static void put_pi_state(struct futex_pi_state *pi_state)
788788
*/
789789
if (pi_state->owner) {
790790
struct task_struct *owner;
791+
unsigned long flags;
791792

792-
raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
793+
raw_spin_lock_irqsave(&pi_state->pi_mutex.wait_lock, flags);
793794
owner = pi_state->owner;
794795
if (owner) {
795796
raw_spin_lock(&owner->pi_lock);
796797
list_del_init(&pi_state->list);
797798
raw_spin_unlock(&owner->pi_lock);
798799
}
799800
rt_mutex_proxy_unlock(&pi_state->pi_mutex, owner);
800-
raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
801+
raw_spin_unlock_irqrestore(&pi_state->pi_mutex.wait_lock, flags);
801802
}
802803

803804
if (current->pi_state_cache) {

0 commit comments

Comments
 (0)