diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-12-20 02:39:43 +0900 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-09-10 16:51:11 +0200 |
| commit | 2efad8609aa23ebda29079f0c5a66ee2cd1c70af (patch) | |
| tree | 8cc8053351446f18e2e7849b9176ccef392fad80 | |
| parent | 0c9c7d44a6ec60a338ba161be217f7da8b9c8948 (diff) | |
net: tcp: deal with listen sockets properly in tcp_abort.
When closing a listen socket, tcp_abort currently calls
tcp_done without clearing the request queue. If the socket has a
child socket that is established but not yet accepted, the child
socket is then left without a parent, causing a leak.
Fix this by setting the socket state to TCP_CLOSE and calling
inet_csk_listen_stop with the socket lock held, like tcp_close
does.
Tested using net_test. With this patch, calling SOCK_DESTROY on a
listen socket that has an established but not yet accepted child
socket results in the parent and the child being closed, such
that they no longer appear in sock_diag dumps.
[Backport of net-next 2010b93e9317cc12acd20c4aed385af7f9d1681e]
Change-Id: I2b9c38fab194b3c4e11439047ead9582c811d4c2
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5ba7e73d7..a164e2d59 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3401,6 +3401,11 @@ int tcp_abort(struct sock *sk, int err) /* Don't race with userspace socket closes such as tcp_close. */ lock_sock(sk); + if (sk->sk_state == TCP_LISTEN) { + tcp_set_state(sk, TCP_CLOSE); + inet_csk_listen_stop(sk); + } + /* Don't race with BH socket closes such as inet_csk_listen_stop. */ local_bh_disable(); bh_lock_sock(sk); |