]> git.baikalelectronics.ru Git - kernel.git/commit
io_uring: sanitize double poll handling
authorJens Axboe <axboe@kernel.dk>
Sat, 15 Aug 2020 18:44:50 +0000 (11:44 -0700)
committerJens Axboe <axboe@kernel.dk>
Sat, 15 Aug 2020 18:48:18 +0000 (11:48 -0700)
commit922351d455cb76c254c555821cdd0f7285633763
tree83fc34f8254636016e92f9eaca00479f3526b73c
parentbae9fda2441a63003e3de6678bb44ed5fc4f3379
io_uring: sanitize double poll handling

There's a bit of confusion on the matching pairs of poll vs double poll,
depending on if the request is a pure poll (IORING_OP_POLL_ADD) or
poll driven retry.

Add io_poll_get_double() that returns the double poll waitqueue, if any,
and io_poll_get_single() that returns the original poll waitqueue. With
that, remove the argument to io_poll_remove_double().

Finally ensure that wait->private is cleared once the double poll handler
has run, so that remove knows it's already been seen.

Cc: stable@vger.kernel.org # v5.8
Reported-by: syzbot+7f617d4a9369028b8a2c@syzkaller.appspotmail.com
Fixes: 374aa5b0b032 ("io_uring: allow POLL_ADD with double poll_wait() users")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c