Re: [PATCH net v2] vsock: only undo SS_CONNECTING when connect() fails
From: Michal Luczaj
Date: Sat Nov 21 2026 - 13:32:47 EST
On 11/18/26 02:34, Bobby Eshleman wrote:
> vsock_connect() sleeps with the socket unlocked. Meanwhile the transport
> can complete the handshake, setting sock->state to SS_CONNECTED, and then
> reset the connection, e.g. in vhost_vsock_reset_orphans(),
> virtio_vsock_reset_sock() or vmci_transport_handle_detach(). When
> connect() gets the lock back, it finds sk_err set and moves the socket
> back to SS_UNCONNECTED. Userspace can then connect() the socket again,
> and a connect() to a CID on another transport makes
> vsock_assign_transport() release the transport the socket was connected
> on.
>
> Only move the socket back to SS_UNCONNECTED if it is still
> SS_CONNECTING. A socket that got connected stays SS_CONNECTED, and
> another connect() fails with -EISCONN.
>
> Likewise, only move sk_state to TCP_CLOSE if it is still TCP_SYN_SENT.
> Otherwise a second thread blocked in connect() on the same socket can
> time out after the first one failed and called listen(), and overwrite
> TCP_LISTEN.
Ohh, this took me a while.
> +/* Avoid breaking the socket when another thread has changed its state while
> + * we were asleep.
> + */
> +static void vsock_connect_close(struct socket *sock)
> +{
> + struct sock *sk = sock->sk;
> +
> + if (sk->sk_state == TCP_SYN_SENT)
> + sk->sk_state = TCP_CLOSE;
> + if (sock->state == SS_CONNECTING)
> + sock->state = SS_UNCONNECTED;
> +}
I was wondering why not
if (sk->sk_state == TCP_SYN_SENT) {
sk->sk_state = TCP_CLOSE;
sock->state = SS_UNCONNECTED;
}
and I think the only reasons we can't say "SYN_SENT iff CONNECTING" is
because shutdown() can flip SYN_SENT/CONNECTING to SYN_SENT/DISCONNECTING.
On connect's failure, the blocking path kinda-ignores such shutdown() and
resets the socket to UNCONNECTED anyway, while the non-blocking (i.e.
vsock_connect_timeout()) also consults sk_shutdown != SHUTDOWN_MASK.
So how about being consistent:
static void vsock_connect_close(struct socket *sock)
{
struct sock *sk = sock->sk;
// we follow vsock_connect_timeout():
// TCP_SYN_SENT implies SS_{DIS,}CONNECTING;
// and we do check sk_shutdown
//
// or am I missing something?
if (sk->sk_state == TCP_SYN_SENT &&
sk->sk_shutdown != SHUTDOWN_MASK) {
sk->sk_state = TCP_CLOSE;
sock->state = SS_UNCONNECTED;
}
}
What do you think?
I guess this approach also addresses "[Severity: Low] What happens if
another thread calls shutdown() while a blocking connect() is asleep?". As
for "[Severity: Medium] Can a connect() waiter that times out late still
abort a newer connect attempt on the same socket?", isn't this the current
situation?
thanks,
Michal