]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
tcp: allow again tcp_disconnect() when threads are waiting
authorPaolo Abeni <pabeni@redhat.com>
Wed, 11 Oct 2023 07:20:55 +0000 (09:20 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 13 Oct 2023 23:49:32 +0000 (16:49 -0700)
commit419ce133ab928ab5efd7b50b2ef36ddfd4eadbd2
tree8d934593e6eaf8f7ded2c7c32e8bd0db8effccd9
parent242e34500a32631f85c2b4eb6cb42a368a39e54f
tcp: allow again tcp_disconnect() when threads are waiting

As reported by Tom, .NET and applications build on top of it rely
on connect(AF_UNSPEC) to async cancel pending I/O operations on TCP
socket.

The blamed commit below caused a regression, as such cancellation
can now fail.

As suggested by Eric, this change addresses the problem explicitly
causing blocking I/O operation to terminate immediately (with an error)
when a concurrent disconnect() is executed.

Instead of tracking the number of threads blocked on a given socket,
track the number of disconnect() issued on such socket. If such counter
changes after a blocking operation releasing and re-acquiring the socket
lock, error out the current operation.

Fixes: 4faeee0cf8a5 ("tcp: deny tcp_disconnect() when threads are waiting")
Reported-by: Tom Deseyn <tdeseyn@redhat.com>
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1886305
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/f3b95e47e3dbed840960548aebaa8d954372db41.1697008693.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c
include/net/sock.h
net/core/stream.c
net/ipv4/af_inet.c
net/ipv4/inet_connection_sock.c
net/ipv4/tcp.c
net/ipv4/tcp_bpf.c
net/mptcp/protocol.c
net/tls/tls_main.c
net/tls/tls_sw.c