tcp: diag: add support for TIME_WAIT sockets to tcp_abort()
Subsystems (3)
PATCH 1/1 tcp: diag: add support for TIME_WAIT sockets to tcp_abort()
Currently, "ss -K -ta ..." does not support TIME_WAIT sockets.
Issue has been raised at least two times in the past [1] [2] it is time to fix it.
[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/CANn89i+R9RgmD=AQ4vX1Vb_SQAj4c3fi7-ZtQz-inYY4Sq4CMQ@mail.gmail.com/T/
While we are at it, use inet_sk_state_load() while tcp_abort() does not hold a lock on the socket.
--- net/ipv4/tcp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
net/ipv4/tcp.c +17 -9
@@ -4531,16 +4531,24 @@ 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); +int state =inet_sk_state_load (sk); -local_bh_disable (); -inet_csk_reqsk_queue_drop (req->rsk_listener, req); -local_bh_enable (); -return 0 ; - } -return -EOPNOTSUPP ; +if (state ==TCP_NEW_SYN_RECV ) { +struct request_sock *req =inet_reqsk (sk); + +local_bh_disable (); +inet_csk_reqsk_queue_drop (req->rsk_listener, req); +local_bh_enable (); +return 0 ; + } +if (state ==TCP_TIME_WAIT ) { +struct inet_timewait_sock *tw =inet_twsk (sk); + +refcount_inc (&tw->tw_refcnt); +local_bh_disable (); +inet_twsk_deschedule_put (tw); +local_bh_enable (); +return 0 ; }/* Don't race with userspace socket closes such as tcp_close. */
Signature · 1 line
2.37.0.rc0.161.g10f37bed90-goog
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 27 Jun 2022 12:10:38 +0000 you wrote:
Currently, "ss -K -ta ..." does not support
TIME_WAITsockets.Issue has been raised at least two times in the past [1] [2] it is time to fix it.
[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/CANn89i+R9RgmD=AQ4vX1Vb_SQAj4c3fi7-ZtQz-inYY4Sq4CMQ@mail.gmail.com/T/[...]
Here is the summary with links:
- [net-next] tcp: diag: add support for TIME_WAIT sockets to tcp_abort()
https://git.kernel.org/netdev/net-next/c/af9784d007d8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html