diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-12-17 16:14:11 -0800 |
|---|---|---|
| committer | Mattias Nissler <mnissler@google.com> | 2016-07-20 16:18:24 +0200 |
| commit | bf1878c1606fa16a9f68cb48018df4b0d346f7f7 (patch) | |
| tree | 4fa161b34a45ff0f6396b33718f29bf3d354c21d | |
| parent | a943340f10644f2569e7253e53c1fd35b27aafc7 (diff) | |
| download | v4.4-bf1878c1606fa16a9f68cb48018df4b0d346f7f7.tar.gz | |
UPSTREAM: 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]
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>
Bug: None
Patchset: net-diag-socket-destroy
Signed-off-by: Mattias Nissler <mnissler@google.com>
Change-Id: I98b5411da553677c3132dbf6a7ba75fd348d26f7
| -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 d09e53b53cca..33da0caa4e8e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3087,6 +3087,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; } |