Commit 80960150 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3f9c1b31 a37ee9e1

io_uring/net.c

+3 −2
Original line number Diff line number Diff line
@@ -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)