io_uring: fix list corruption race in io_pollfree_wake()
PATCH 1/1 io_uring: fix list corruption race in io_pollfree_wake()
io_pollfree_wake() removes the poll wait entry without holding the waitqueue head lock. Other removal paths take the head lock, so this can race and lead to list corruption detected by list_debug.
Acquire the waitqueue lock before calling io_poll_remove_waitq(), matching the locking used in io_poll_remove_entry().
--- io_uring/poll.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
io_uring/poll.c +8 -1
@@ -383,10 +383,17 @@ static void io_poll_cancel_req(struct io_kiocb *req)static __cold int io_pollfree_wake (struct io_kiocb *req,struct io_poll *poll) { +struct wait_queue_head *head;io_poll_mark_cancelled (req);/* we have to kick tw in case it's not already */ io_poll_execute (req,0 ); -io_poll_remove_waitq (poll); +/* Pairs with smp_store_release() in io_poll_remove_waitq() */ + head =smp_load_acquire (&poll->head); +if (head) { +spin_lock_irq (&head->lock); +io_poll_remove_waitq (poll); +spin_unlock_irq (&head->lock); + }return 1 ; }
Signature · 1 line
2.34.1
Jens Axboe
maintainerQuoted 26 lines · Soham Kute
io_pollfree_wake()removes the poll wait entry without holding the waitqueue head lock. Other removal paths take the head lock, so this can race and lead to list corruption detected bylist_debug.Acquire the waitqueue lock before calling
io_poll_remove_waitq(), matching the locking used inio_poll_remove_entry().Reported-by [email protected]Signed-off-by Soham Kute <[email protected]>--- io_uring/poll.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)io_uring/poll.c +1
-0@@ -383,10 +383,17 @@ static void io_poll_cancel_req(struct io_kiocb *req)static __cold int io_pollfree_wake (struct io_kiocb *req,struct io_poll *poll) { +struct wait_queue_head *head;io_poll_mark_cancelled (req);/* we have to kick tw in case it's not already */ io_poll_execute (req,0 );
io_uring/poll.c static void io_poll_cancel_req(struct io_kiocb *req) · line 398
Quoted 10 lines
io_uring/poll.c +7
-1-io_poll_remove_waitq (poll); +/* Pairs with smp_store_release() in io_poll_remove_waitq() */ + head =smp_load_acquire (&poll->head); +if (head) { +spin_lock_irq (&head->lock); +io_poll_remove_waitq (poll); +spin_unlock_irq (&head->lock); + }return 1 ; }
The callpath is io_poll_wake() -> io_pollfree_wake(), where the former where much holds &head->lock already. How did you come to this conclusion? Your patch would instantly deadlock.
Additionally, if you follow the replies off your syzbot link:
you'll see I already debugged this issue, it's a media bug, and there's no POLLFREE involved at all. And it looks like I'm not even the first one to debug it, I subsequently found that someone else sent in a different patch for this last year, but solving the same root cause in media.
Signature · 1 line
Jens Axboe