net: make socket read/write_iter() honor IOCB_NOWAIT (ebfcd895) · Commits · 戴 / test

The socket read/write helpers only look at the file O_NONBLOCK. not the iocb IOCB_NOWAIT flag. This breaks users like preadv2/pwritev2 and io_uring that rely on not having the file itself marked nonblocking, but rather the iocb itself. Cc: netdev@vger.kernel.org Acked-by:

David Miller <davem@davemloft.net> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

net/socket.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -957,7 +957,7 @@ static ssize_t sock_read_iter(struct kiocb iocb, struct iov_iter to)
		.msg_iocb = iocb};
		ssize_t res;

		if (file->f_flags & O_NONBLOCK)
		if (file->f_flags & O_NONBLOCK \|\| (iocb->ki_flags & IOCB_NOWAIT))
		msg.msg_flags = MSG_DONTWAIT;

		if (iocb->ki_pos != 0)
		@@ -982,7 +982,7 @@ static ssize_t sock_write_iter(struct kiocb iocb, struct iov_iter from)
		if (iocb->ki_pos != 0)
		return -ESPIPE;

		if (file->f_flags & O_NONBLOCK)
		if (file->f_flags & O_NONBLOCK \|\| (iocb->ki_flags & IOCB_NOWAIT))
		msg.msg_flags = MSG_DONTWAIT;

		if (sock->type == SOCK_SEQPACKET)

Admin message