diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2025-02-23 17:22:29 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-20 10:22:58 +0200 |
| commit | 45440cbba4a089f07249769f1f8f864f9d05464e (patch) | |
| tree | 01bc24c8c1d5791ba8705401ba45ade19eddd6c0 /io_uring | |
| parent | 9e51a6a44e2c4de780a26e8fe110d708e806a8cd (diff) | |
| download | linux-45440cbba4a089f07249769f1f8f864f9d05464e.tar.gz linux-45440cbba4a089f07249769f1f8f864f9d05464e.tar.bz2 linux-45440cbba4a089f07249769f1f8f864f9d05464e.zip | |
io_uring/net: fix accept multishot handling
commit f6a89bf5278d6e15016a736db67043560d1b50d5 upstream.
REQ_F_APOLL_MULTISHOT doesn't guarantee it's executed from the multishot
context, so a multishot accept may get executed inline, fail
io_req_post_cqe(), and ask the core code to kill the request with
-ECANCELED by returning IOU_STOP_MULTISHOT even when a socket has been
accepted and installed.
Cc: stable@vger.kernel.org
Fixes: 390ed29b5e425 ("io_uring: add IORING_ACCEPT_MULTISHOT for accept")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/51c6deb01feaa78b08565ca8f24843c017f5bc80.1740331076.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/net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 16d54cd4d53f..7a3f3cec359d 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1650,6 +1650,8 @@ retry: } io_req_set_res(req, ret, cflags); + if (!(issue_flags & IO_URING_F_MULTISHOT)) + return IOU_OK; return IOU_STOP_MULTISHOT; } |