Skip to content

Commit b549113

Browse files
Sebastian Andrzej SiewiorKAGA-KOKO
authored andcommitted
futex: Prevent use-after-free during requeue-PI
syzbot managed to trigger the following race: T1 T2 futex_wait_requeue_pi() futex_do_wait() schedule() futex_requeue() futex_proxy_trylock_atomic() futex_requeue_pi_prepare() requeue_pi_wake_futex() futex_requeue_pi_complete() /* preempt */ * timeout/ signal wakes T1 * futex_requeue_pi_wakeup_sync() // Q_REQUEUE_PI_LOCKED futex_hash_put() // back to userland, on stack futex_q is garbage /* back */ wake_up_state(q->task, TASK_NORMAL); In this scenario futex_wait_requeue_pi() is able to leave without using futex_q::lock_ptr for synchronization. This can be prevented by reading futex_q::task before updating the futex_q::requeue_state. A reference on the task_struct is not needed because requeue_pi_wake_futex() is invoked with a spinlock_t held which implies a RCU read section. Even if T1 terminates immediately after, the task_struct will remain valid during T2's wake_up_state(). A READ_ONCE on futex_q::task before futex_requeue_pi_complete() is enough because it ensures that the variable is read before the state is updated. Read futex_q::task before updating the requeue state, use it for the following wakeup. Fixes: 07d91ef ("futex: Prevent requeue_pi() lock nesting issue on RT") Reported-by: [email protected] Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/
1 parent f83ec76 commit b549113

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

kernel/futex/requeue.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ static inline
230230
void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key,
231231
struct futex_hash_bucket *hb)
232232
{
233-
q->key = *key;
233+
struct task_struct *task;
234234

235+
q->key = *key;
235236
__futex_unqueue(q);
236237

237238
WARN_ON(!q->rt_waiter);
@@ -243,10 +244,11 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key,
243244
futex_hash_get(hb);
244245
q->drop_hb_ref = true;
245246
q->lock_ptr = &hb->lock;
247+
task = READ_ONCE(q->task);
246248

247249
/* Signal locked state to the waiter */
248250
futex_requeue_pi_complete(q, 1);
249-
wake_up_state(q->task, TASK_NORMAL);
251+
wake_up_state(task, TASK_NORMAL);
250252
}
251253

252254
/**

0 commit comments

Comments
 (0)