Commit c8b5e260 authored Oct 25, 2020 by Jens Axboe

io_uring: use type appropriate io_kiocb handler for double poll



io_poll_double_wake() is called for both request types - both pure poll
requests, and internal polls. This means that we should be using the
right handler based on the request type. Use the one that the original
caller already assigned for the waitqueue handling, that will always
match the correct type.

Cc: stable@vger.kernel.org # v5.8+
Reported-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 0d63c148

fs/io_uring.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -4959,8 +4959,10 @@ static int io_poll_double_wake(struct wait_queue_entry *wait, unsigned mode,
		/* make sure double remove sees this as being gone */
		wait->private = NULL;
		spin_unlock(&poll->head->lock);
		if (!done)
		__io_async_wake(req, poll, mask, io_poll_task_func);
		if (!done) {
		/* use wait func handler, so it matches the rq type */
		poll->wait.func(&poll->wait, mode, sync, key);
		}
		}
		refcount_dec(&req->refs);
		return 1;

Admin message