net: tcp: deal with listen sockets properly in tcp_abort.
authorLorenzo Colitti <lorenzo@google.com>
Mon, 21 Dec 2015 15:03:44 +0000 (00:03 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Thu, 25 Feb 2016 00:01:21 +0000 (09:01 +0900)
commit15248ad94d84af8d48366e102a032374fd937044
tree4252e9fca80d367d579ccf4b94f7fb925051f2bd
parent13e7d45b6ac023bb0547221382d1e63395076bda
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.

[cherry-pick of net-next 2010b93e9317cc12acd20c4aed385af7f9d1681e]

Change-Id: I0555a142f11d8b36362ffd7c8ef4a5ecae8987c9
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>
net/ipv4/tcp.c