Commit 4f7d54f5 authored Jan 05, 2009 by Lennert Buytenhek Committed by David S. Miller Jan 05, 2009

tcp: don't mask EOF and socket errors on nonblocking splice receive



Currently, setting SPLICE_F_NONBLOCK on splice from a TCP socket
results in masking of EOF (RDHUP) and error conditions on the socket
by an -EAGAIN return.  Move the NONBLOCK check in tcp_splice_read()
to be after the EOF and error checks to fix this.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 129fa447

net/ipv4/tcp.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -580,10 +580,6 @@ ssize_t tcp_splice_read(struct socket sock, loff_t ppos,
		else if (!ret) {
		if (spliced)
		break;
		if (flags & SPLICE_F_NONBLOCK) {
		ret = -EAGAIN;
		break;
		}
		if (sock_flag(sk, SOCK_DONE))
		break;
		if (sk->sk_err) {
		@@ -601,6 +597,10 @@ ssize_t tcp_splice_read(struct socket sock, loff_t ppos,
		ret = -ENOTCONN;
		break;
		}
		if (flags & SPLICE_F_NONBLOCK) {
		ret = -EAGAIN;
		break;
		}
		if (!timeo) {
		ret = -EAGAIN;
		break;