diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2025-02-10 17:27:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-21 13:49:53 +0100 |
| commit | 233b210a678bddf8b49b02a070074a52b87e6d43 (patch) | |
| tree | f019aa86acc9578ea98f478cdc31062d48130a82 /io_uring | |
| parent | 30ab0f6c90f89bfb5429c534cc70cef5478b0041 (diff) | |
| download | linux-233b210a678bddf8b49b02a070074a52b87e6d43.tar.gz linux-233b210a678bddf8b49b02a070074a52b87e6d43.tar.bz2 linux-233b210a678bddf8b49b02a070074a52b87e6d43.zip | |
io_uring: fix multishots with selected buffers
[ upstream commit d63b0e8a628e62ca85a0f7915230186bb92f8bb4 ]
We do io_kbuf_recycle() when arming a poll but every iteration of a
multishot can grab more buffers, which is why we need to flush the kbuf
ring state before continuing with waiting.
Cc: stable@vger.kernel.org
Fixes: b3fdea6ecb55c ("io_uring: multishot recv")
Reported-by: Muhammad Ramdhan <ramdhan@starlabs.sg>
Reported-by: Bing-Jhong Billy Jheng <billy@starlabs.sg>
Reported-by: Jacob Soo <jacob.soo@starlabs.sg>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/1bfc9990fe435f1fc6152ca9efeba5eb3e68339c.1738025570.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/poll.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/io_uring/poll.c b/io_uring/poll.c index 428f84ed1021..bbdc9a7624a1 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -307,6 +307,8 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked) } } else { int ret = io_poll_issue(req, locked); + io_kbuf_recycle(req, 0); + if (ret == IOU_STOP_MULTISHOT) return IOU_POLL_REMOVE_POLL_USE_RES; if (ret < 0) |