diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-16 13:51:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-16 13:51:20 -0800 |
| commit | 8096015082592cf282fdee9d052aa1d3bbadb805 (patch) | |
| tree | 68046e7dffd9bf74f83ee6bee7d1134da61b1305 | |
| parent | 3f9c1b315d65fb4b3a2352d579c35d662b0c2ae0 (diff) | |
| parent | a37ee9e117ef73bbc2f5c0b31911afd52d229861 (diff) | |
| download | asm-generic-8096015082592cf282fdee9d052aa1d3bbadb805.tar.gz | |
Merge tag 'io_uring-6.8-2024-02-16' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe:
"Just a single fix for a regression in how overflow is handled for
multishot accept requests"
* tag 'io_uring-6.8-2024-02-16' of git://git.kernel.dk/linux:
io_uring/net: fix multishot accept overflow handling
| -rw-r--r-- | io_uring/net.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 43bc9a5f96f9d1..161622029147ca 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1372,7 +1372,7 @@ retry: * has already been done */ if (issue_flags & IO_URING_F_MULTISHOT) - ret = IOU_ISSUE_SKIP_COMPLETE; + return IOU_ISSUE_SKIP_COMPLETE; return ret; } if (ret == -ERESTARTSYS) @@ -1397,7 +1397,8 @@ retry: ret, IORING_CQE_F_MORE)) goto retry; - return -ECANCELED; + io_req_set_res(req, ret, 0); + return IOU_STOP_MULTISHOT; } int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) |