[PATCH net v2] vsock: only undo SS_CONNECTING when connect() fails

From: Bobby Eshleman

Date: Tue Nov 17 2026 - 20:34:47 EST


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.

Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
Reported-by: Kyle Zeng <kylebot@xxxxxxxxxx>
Link: https://lore.kernel.org/netdev/20260909-vsock-connect-reset-closing-v1-1-50298b9ccfbf@xxxxxxx/
Suggested-by: Michal Luczaj <mhal@xxxxxxx>
Signed-off-by: Bobby Eshleman <bobbyeshleman@xxxxxxxx>
---
Changes in v2:
- Only reset sk_state if it is still TCP_SYN_SENT, so a concurrent
connect() caller that times out late doesn't overwrite TCP_LISTEN
(Sashiko).
- Drop Michal's Reviewed-by since the code changed.
- Link to v1: https://lore.kernel.org/r/20261116-vsock-connect-close-v1-1-43fb125973dd@xxxxxxxx
---
net/vmw_vsock/af_vsock.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 1d7d53542724..ce958b48295b 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1704,6 +1704,19 @@ static void vsock_connect_timeout(struct work_struct *work)
sock_put(sk);
}

+/* 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;
+}
+
static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,
int addr_len, int flags)
{
@@ -1862,8 +1875,7 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,
* sk_state == TCP_SYN_SENT, which hereby we break.
* In such case VIRTIO_VSOCK_OP_RST will follow.
*/
- sk->sk_state = TCP_CLOSE;
- sock->state = SS_UNCONNECTED;
+ vsock_connect_close(sock);

/* Try to cancel VIRTIO_VSOCK_OP_REQUEST skb sent out by
* transport->connect().
@@ -1877,10 +1889,8 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,
}

err = sock_error(sk);
- if (err) {
- sk->sk_state = TCP_CLOSE;
- sock->state = SS_UNCONNECTED;
- }
+ if (err)
+ vsock_connect_close(sock);

out_wait:
finish_wait(sk_sleep(sk), &wait);

---
base-commit: 533ec433efdc11196f438da90d683053a57257ff
change-id: 20261116-vsock-connect-close-1beb7cb51e7a

Best regards,
--
Bobby Eshleman <bobbyeshleman@xxxxxxxx>