diff options
| author |   Eric Dumazet <edumazet@google.com> | 2015-12-17 16:14:11 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-18 16:06:39 -0500 |
| commit | 07f6f4a31e5a8dee67960fc07bb0b37c5f879d4d (patch) | |
| tree | 729a57a6a8b11331a4be6df5fffe7fc001f570f9 /net/ipv4/tcp.c | |
| parent | Merge branch 'bpf-misc-updates' (diff) | |
| download | linux-dev-07f6f4a31e5a8dee67960fc07bb0b37c5f879d4d.tar.xz linux-dev-07f6f4a31e5a8dee67960fc07bb0b37c5f879d4d.zip | |
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.
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>
Diffstat (limited to 'net/ipv4/tcp.c')
| -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 2c0e340518d2..cc7aaa507abf 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3083,6 +3083,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; } |