Commit 88fc8b84 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/net: initalize msghdr->msg_inq to known value 



We can't currently tell if ->msg_inq was set when we ask for msg_get_inq,
initialize it to -1U so we can tell apart if it was set and there's
no data left, or if it just wasn't set at all by the protocol.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bf34e697

io_uring/net.c

+4 −2
Original line number Diff line number Diff line
@@ -785,6 +785,7 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) 
		min_ret = iov_iter_count(&kmsg->msg.msg_iter);



	kmsg->msg.msg_get_inq = 1;

	kmsg->msg.msg_inq = -1U;

	if (req->flags & REQ_F_APOLL_MULTISHOT)

		ret = io_recvmsg_multishot(sock, sr, kmsg, flags,

					   &mshot_finished);
@@ -821,7 +822,7 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) 
		io_kbuf_recycle(req, issue_flags);



	cflags = io_put_kbuf(req, issue_flags);

	if (kmsg->msg.msg_inq)

	if (kmsg->msg.msg_inq && kmsg->msg.msg_inq != -1U)

		cflags |= IORING_CQE_F_SOCK_NONEMPTY;



	if (!io_recv_finish(req, &ret, cflags, mshot_finished, issue_flags))
@@ -882,6 +883,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
	if (unlikely(ret))

		goto out_free;



	msg.msg_inq = -1U;

	msg.msg_flags = 0;



	flags = sr->msg_flags;
@@ -923,7 +925,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
		io_kbuf_recycle(req, issue_flags);



	cflags = io_put_kbuf(req, issue_flags);

	if (msg.msg_inq)

	if (msg.msg_inq && msg.msg_inq != -1U)

		cflags |= IORING_CQE_F_SOCK_NONEMPTY;



	if (!io_recv_finish(req, &ret, cflags, ret <= 0, issue_flags))