Commit 8caa03f1 authored by Jens Axboe's avatar Jens Axboe

io_uring/poll: don't reissue in case of poll race on multishot request

A previous commit fixed a poll race that can occur, but it's only
applicable for multishot requests. For a multishot request, we can safely
ignore a spurious wakeup, as we never leave the waitqueue to begin with.

A blunt reissue of a multishot armed request can cause us to leak a
buffer, if they are ring provided. While this seems like a bug in itself,
it's not really defined behavior to reissue a multishot request directly.
It's less efficient to do so as well, and not required to rearm anything
like it is for singleshot poll requests.

Cc: stable@vger.kernel.org
Fixes: 6e5aedb9 ("io_uring/poll: attempt request issue after racy poll wakeup")
Reported-and-tested-by: default avatarOlivier Langlois <olivier@trillion01.com>
Link: https://github.com/axboe/liburing/issues/778Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8579538c
...@@ -283,9 +283,13 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked) ...@@ -283,9 +283,13 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
* to the waitqueue, so if we get nothing back, we * to the waitqueue, so if we get nothing back, we
* should be safe and attempt a reissue. * should be safe and attempt a reissue.
*/ */
if (unlikely(!req->cqe.res)) if (unlikely(!req->cqe.res)) {
/* Multishot armed need not reissue */
if (!(req->apoll_events & EPOLLONESHOT))
continue;
return IOU_POLL_REISSUE; return IOU_POLL_REISSUE;
} }
}
if (req->apoll_events & EPOLLONESHOT) if (req->apoll_events & EPOLLONESHOT)
return IOU_POLL_DONE; return IOU_POLL_DONE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment