diff options
| author | Lennert Buytenhek <buytenh@marvell.com> | 2009-01-20 15:25:21 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-24 16:41:43 -0800 |
| commit | 6a2b80089ea067018ab287e2e9df5387ee811013 (patch) | |
| tree | 3d557d6e3c254162aa316eb9eb2dc078d435cb49 /net | |
| parent | 832484c82b39fe9d47b8ca4a03c270b26befa229 (diff) | |
tcp: don't mask EOF and socket errors on nonblocking splice receive
[ Upstream commit: 4f7d54f59bc470f0aaa932f747a95232d7ebf8b1 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c5aca0bb116a..9e31f915519b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -578,10 +578,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) { @@ -599,6 +595,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; |