lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Lennert Buytenhek
2009-01-05 00:00:12 -08:00
committed by David S. Miller
parent 129fa44785
commit 4f7d54f59b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/tcp.c
View File

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