path: root/net
diff options
authorEric Dumazet <>2021-02-13 06:26:34 -0800
committerDavid S. Miller <>2021-02-15 13:20:36 -0800
commit39354eb29f597aa01b3d51ccc8169cf183c4367f (patch)
tree4b3a4e8176697ad14bd78e7d281e8bafd7ba3e2c /net
parentca04422afd6998611a81d0ea1b61d5a5f4923f84 (diff)
tcp: tcp_data_ready() must look at SOCK_DONE
My prior cleanup missed that tcp_data_ready() has to look at SOCK_DONE. Otherwise, an application using SO_RCVLOWAT will not get EPOLLIN event if a FIN is received in the middle of expected payload. The reason SOCK_DONE is not examined in tcp_epollin_ready() is that tcp_poll() catches the FIN because tcp_fin() is also setting RCV_SHUTDOWN into sk->sk_shutdown Fixes: 05dc72aba364 ("tcp: factorize logic into tcp_epollin_ready()") Signed-off-by: Eric Dumazet <> Reported-by: Wei Wang <> Cc: Arjun Roy <> Reviewed-by: Wei Wang <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e32a7056cb76..69a545db80d2 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4924,7 +4924,7 @@ err:
void tcp_data_ready(struct sock *sk)
- if (tcp_epollin_ready(sk, sk->sk_rcvlowat))
+ if (tcp_epollin_ready(sk, sk->sk_rcvlowat) || sock_flag(sk, SOCK_DONE))