Skip to content

Commit 8caa03f

Browse files
committed
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: 6e5aedb ("io_uring/poll: attempt request issue after racy poll wakeup") Reported-and-tested-by: Olivier Langlois <olivier@trillion01.com> Link: axboe/liburing#778 Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 8579538 commit 8caa03f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

io_uring/poll.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,12 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
283283
* to the waitqueue, so if we get nothing back, we
284284
* should be safe and attempt a reissue.
285285
*/
286-
if (unlikely(!req->cqe.res))
286+
if (unlikely(!req->cqe.res)) {
287+
/* Multishot armed need not reissue */
288+
if (!(req->apoll_events & EPOLLONESHOT))
289+
continue;
287290
return IOU_POLL_REISSUE;
291+
}
288292
}
289293
if (req->apoll_events & EPOLLONESHOT)
290294
return IOU_POLL_DONE;

0 commit comments

Comments
 (0)