Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b280f0ea authored by Jens Axboe's avatar Jens Axboe Committed by Greg Kroah-Hartman
Browse files

net: make socket read/write_iter() honor IOCB_NOWAIT 



[ Upstream commit ebfcd8955c0b52eb793bcbc9e71140e3d0cdb228 ]

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: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9d5b54cf

net/socket.c

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