Commit bf34e697 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/net: initialize struct msghdr more sanely for io_recv() 



We only need to clear the input fields on the first invocation, not
when potentially doing a retry.

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

io_uring/net.c

+8 −7
Original line number Diff line number Diff line
@@ -860,6 +860,14 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
	if (unlikely(!sock))

		return -ENOTSOCK;



	msg.msg_name = NULL;

	msg.msg_namelen = 0;

	msg.msg_control = NULL;

	msg.msg_get_inq = 1;

	msg.msg_controllen = 0;

	msg.msg_iocb = NULL;

	msg.msg_ubuf = NULL;



retry_multishot:

	if (io_do_buffer_select(req)) {

		void __user *buf;
@@ -874,14 +882,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
	if (unlikely(ret))

		goto out_free;



	msg.msg_name = NULL;

	msg.msg_namelen = 0;

	msg.msg_control = NULL;

	msg.msg_get_inq = 1;

	msg.msg_flags = 0;

	msg.msg_controllen = 0;

	msg.msg_iocb = NULL;

	msg.msg_ubuf = NULL;



	flags = sr->msg_flags;

	if (force_nonblock)