Commit 8a9c6c40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.10-20240703' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "A fix for a feature that went into the 6.10 merge window actually
  ended up causing a regression in building bundles for receives.

  Fix that up by ensuring we don't overwrite msg_inq before we use
  it in the loop"

* tag 'io_uring-6.10-20240703' of git://git.kernel.dk/linux:
  io_uring/net: don't clear msg_inq before io_recv_buf_select() needs it
parents 4a0929b0 6e92c646

io_uring/net.c

+6 −4
Original line number Diff line number Diff line
@@ -1127,16 +1127,18 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
		flags |= MSG_DONTWAIT;



retry_multishot:

	kmsg->msg.msg_inq = -1;

	kmsg->msg.msg_flags = 0;



	if (io_do_buffer_select(req)) {

		ret = io_recv_buf_select(req, kmsg, &len, issue_flags);

		if (unlikely(ret))

		if (unlikely(ret)) {

			kmsg->msg.msg_inq = -1;

			goto out_free;

		}

		sr->buf = NULL;

	}



	kmsg->msg.msg_flags = 0;

	kmsg->msg.msg_inq = -1;



	if (flags & MSG_WAITALL)

		min_ret = iov_iter_count(&kmsg->msg.msg_iter);