diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-12-17 16:14:11 -0800 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2016-02-25 09:01:21 +0900 |
| commit | 13e7d45b6ac023bb0547221382d1e63395076bda (patch) | |
| tree | 257018486bd9d97d28d463922ac2f1fa16fcb168 | |
| parent | 79170d8d5d551d2a0ea3fd98a62721a2818402d8 (diff) | |
tcp: diag: add support for request sockets to tcp_abort()
Adding support for SYN_RECV request sockets to tcp_abort()
is quite easy after our tcp listener rewrite.
Note that we also need to better handle listeners, or we might
leak not yet accepted children, because of a missing
inet_csk_listen_stop() call.
[cherry-pick of net-next 07f6f4a31e5a8dee67960fc07bb0b37c5f879d4d]
Change-Id: I8ec6b2e6ec24f330a69595abf1d5469ace79b3fd
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Lorenzo Colitti <lorenzo@google.com>
Tested-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index ac38ffd357d5..5c63da3ae48e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3100,6 +3100,15 @@ EXPORT_SYMBOL_GPL(tcp_done); int tcp_abort(struct sock *sk, int err) { if (!sk_fullsock(sk)) { + if (sk->sk_state == TCP_NEW_SYN_RECV) { + struct request_sock *req = inet_reqsk(sk); + + local_bh_disable(); + inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, + req); + local_bh_enable(); + return 0; + } sock_gen_put(sk); return -EOPNOTSUPP; } |