mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-26 20:38:12 +00:00
Code Issues Releases Wiki Activity

io_uring-6.8-2024-02-16

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmXPsxUQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpgL2D/9xMB9b1dmjiYP/awCCIe6rafS5qfyFtdMc
 CLUHJdBSkGX6xLfJJB12XJlurcgla6CUwDoxFdhABQ3nsdaWo4ygw7cKNXbqNB3H
 ZLzP8SXAnLsUc/qoiPQKqMHSy4vuFc3jKqwmlWeVZ5LSVnxiQ6UYobxn76kZuNL2
 ituko6K3s1Rfv9XSURPZhaLddivY5P9znDGl+O9lGeavN7L34FRfDIRRgMgPn18e
 KhCOrsE0rfXDPDgDtx0xELbMx7DCz2axCOuNvpHbNTwS6gB68CjErYcjjJziSglm
 VMaL9kNlYIyJUXUA5IfGdauMSJEUh6VuhQodTyXHoAuByen5ETkrDtP+zF1BrBqV
 /O0uQ2Xu7kz0bKNVOe64V0lIGXNUED2G4M+bs+EWkXw8jNIl3WqReKUKZ2xL7y3S
 3UiEPkmE90ny8eK5b/0IwPTIJjOrb7mKLlXM7trnYgRekKMWThSwZ4SSiRCgH/za
 rKqpCNveIRhbpSfinhtoIJAtv/bOtgEFnQdBSmWzyzJ3DGZfosvJDfz5xkEBWVCr
 GIoY8JWO9HzONsK+ip1gt/xoOVdBVXbmdnc7E7AXKoGU8lKayzPpyBlUZm2rd/+5
 hqnn8W7AAtCa3KaPXhldzMtyWJWQbsofSOoJ/axkuvmIMliwfWutrQ0RAIKtdyUm
 dPyUR5S+jA==
 =Hsua
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-02-16 13:51:20 -08:00
commit 8096015082
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
io_uring/net.c
View file

@ -1372,7 +1372,7 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags)
* 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 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags)
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)