* [PATCH net] inet: release newly acquired port on inet_csk_listen_start() hash error
@ 2026-11-19 19:21 Dominik Maier
2026-11-21 20:59 ` Kuniyuki Iwashima
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Maier @ 2026-11-19 19:21 UTC (permalink / raw)
To: Eric Dumazet, Neal Cardwell, Kuniyuki Iwashima
Cc: Jakub Kicinski, Joanne Koong, netdev, dmnk+artist, Dominik Maier
When inet_csk_listen_start() is called on a socket that has not been
explicitly bound, sk->sk_prot->get_port() allocates an ephemeral port
and links the socket into bhash and bhash2 without setting
SOCK_BINDPORT_LOCK. If sk->sk_prot->hash() then fails (for example,
when a prior failed connect() left icsk->unhashed_state set to
TCP_SYN_SENT so inet_hash() returns -EINVAL), inet_csk_listen_start()
resets sk_state to TCP_CLOSE and returns the error without releasing
the newly acquired port.
Because inet->inet_num remains non-zero while SOCK_BINDPORT_LOCK is
unset, a subsequent Fast Open connect on a dual-stack AF_INET6 socket
can update sk_v6_rcv_saddr via tcp_v4_connect() without rehashing the
bhash2 entry. Disconnecting with AF_UNSPEC then invokes
__inet_put_port(), which locks the new address's bhash2 bucket while
unlinking and freeing tb2 from the original bhash2 bucket without
holding its spinlock.
Record whether icsk->icsk_bind_hash was already populated before
get_port(). On error, after transitioning back to TCP_CLOSE and before
purging the Fast Open RST queue, clear inet->inet_sport and call
inet_put_port(sk) if get_port() newly bound the socket. Sockets that
were explicitly bound before listen() retain their user-bound port.
This issue was discovered with an AI-assisted code review tool (ARTIST)
and reproduced in QEMU/KVM on an unmodified v7.4-rc3 kernel without
kernel modifications or error injection; a standalone reproducer is
available upon maintainers' request. An earlier revision of this fix was
verified against the reproducer in QEMU/KVM; this version, rebased onto
commit 342e62fd34c2 ("tcp: purge Fast Open RST queue when listen() fails"),
was checked with checkpatch.pl --strict.
Fixes: 8cc3aef0cb19 ("tcp: Do not allow buggy transitions between ehash and lhash2.")
Fixes: 28044fc1d495 ("net: Add a bhash2 table hashed by port and address")
Cc: stable@vger.kernel.org
Signed-off-by: Dominik Maier <dmnk@google.com>
---
net/ipv4/inet_connection_sock.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 9a3b05e..2f367a1 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -1369,6 +1369,7 @@ int inet_csk_listen_start(struct sock *sk)
{
struct inet_connection_sock *icsk = inet_csk(sk);
struct inet_sock *inet = inet_sk(sk);
+ bool bound;
int err;
err = inet_ulp_can_listen(sk);
@@ -1385,6 +1386,7 @@ int inet_csk_listen_start(struct sock *sk)
* It is OK, because this socket enters to hash table only
* after validation is complete.
*/
+ bound = !!icsk->icsk_bind_hash;
inet_sk_state_store(sk, TCP_LISTEN);
err = sk->sk_prot->get_port(sk, inet->inet_num);
if (!err) {
@@ -1398,6 +1400,10 @@ int inet_csk_listen_start(struct sock *sk)
}
inet_sk_set_state(sk, TCP_CLOSE);
+ if (!bound && icsk->icsk_bind_hash) {
+ inet->inet_sport = 0;
+ inet_put_port(sk);
+ }
/* A Fast Open child accepted before a previous shutdown() of this
* listener might have queued its request in rskq_rst_head while
--
2.56.1.809.ga0b61035b5-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] inet: release newly acquired port on inet_csk_listen_start() hash error
2026-11-19 19:21 [PATCH net] inet: release newly acquired port on inet_csk_listen_start() hash error Dominik Maier
@ 2026-11-21 20:59 ` Kuniyuki Iwashima
0 siblings, 0 replies; 2+ messages in thread
From: Kuniyuki Iwashima @ 2026-11-21 20:59 UTC (permalink / raw)
To: Dominik Maier
Cc: Eric Dumazet, Neal Cardwell, Jakub Kicinski, Joanne Koong, netdev,
dmnk+artist
On Thu, 19 Nov 2026 20:21:33 +0100, Dominik Maier wrote:
> When inet_csk_listen_start() is called on a socket that has not been
> explicitly bound, sk->sk_prot->get_port() allocates an ephemeral port
> and links the socket into bhash and bhash2 without setting
> SOCK_BINDPORT_LOCK. If sk->sk_prot->hash() then fails (for example,
> when a prior failed connect() left icsk->unhashed_state set to
> TCP_SYN_SENT so inet_hash() returns -EINVAL), inet_csk_listen_start()
> resets sk_state to TCP_CLOSE and returns the error without releasing
> the newly acquired port.
>
> Because inet->inet_num remains non-zero while SOCK_BINDPORT_LOCK is
> unset, a subsequent Fast Open connect on a dual-stack AF_INET6 socket
> can update sk_v6_rcv_saddr via tcp_v4_connect() without rehashing the
> bhash2 entry. Disconnecting with AF_UNSPEC then invokes
> __inet_put_port(), which locks the new address's bhash2 bucket while
> unlinking and freeing tb2 from the original bhash2 bucket without
> holding its spinlock.
>
> Record whether icsk->icsk_bind_hash was already populated before
> get_port(). On error, after transitioning back to TCP_CLOSE and before
> purging the Fast Open RST queue, clear inet->inet_sport and call
> inet_put_port(sk) if get_port() newly bound the socket. Sockets that
> were explicitly bound before listen() retain their user-bound port.
>
> This issue was discovered with an AI-assisted code review tool (ARTIST)
> and reproduced in QEMU/KVM on an unmodified v7.4-rc3 kernel without
> kernel modifications or error injection; a standalone reproducer is
> available upon maintainers' request. An earlier revision of this fix was
> verified against the reproducer in QEMU/KVM; this version, rebased onto
> commit 342e62fd34c2 ("tcp: purge Fast Open RST queue when listen() fails"),
> was checked with checkpatch.pl --strict.
Please move the last paragraph under ---.
>
> Fixes: 8cc3aef0cb19 ("tcp: Do not allow buggy transitions between ehash and lhash2.")
This is not needed.
> Fixes: 28044fc1d495 ("net: Add a bhash2 table hashed by port and address")
> Cc: stable@vger.kernel.org
> Signed-off-by: Dominik Maier <dmnk@google.com>
> ---
> net/ipv4/inet_connection_sock.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
> index 9a3b05e..2f367a1 100644
> --- a/net/ipv4/inet_connection_sock.c
> +++ b/net/ipv4/inet_connection_sock.c
> @@ -1369,6 +1369,7 @@ int inet_csk_listen_start(struct sock *sk)
> {
> struct inet_connection_sock *icsk = inet_csk(sk);
> struct inet_sock *inet = inet_sk(sk);
> + bool bound;
> int err;
>
> err = inet_ulp_can_listen(sk);
> @@ -1385,6 +1386,7 @@ int inet_csk_listen_start(struct sock *sk)
> * It is OK, because this socket enters to hash table only
> * after validation is complete.
> */
> + bound = !!icsk->icsk_bind_hash;
> inet_sk_state_store(sk, TCP_LISTEN);
> err = sk->sk_prot->get_port(sk, inet->inet_num);
> if (!err) {
> @@ -1398,6 +1400,10 @@ int inet_csk_listen_start(struct sock *sk)
> }
>
> inet_sk_set_state(sk, TCP_CLOSE);
> + if (!bound && icsk->icsk_bind_hash) {
> + inet->inet_sport = 0;
> + inet_put_port(sk);
> + }
Please move this to the block above after ->hash() failure
and call inet_put_port() before clearing inet_sport.
---
pw-bot: cr
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-21 20:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 19:21 [PATCH net] inet: release newly acquired port on inet_csk_listen_start() hash error Dominik Maier
2026-11-21 20:59 ` Kuniyuki Iwashima
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox