All of lore.kernel.org
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Bobby Eshleman" <bobbyeshleman@meta.com>
Cc: virtualization@lists.linux.dev,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Eugenio Perez" <eperezma@redhat.com>
Subject: Re: [PATCH net] vsock: only undo SS_CONNECTING when connect() fails
Date: Wed, 18 Nov 2026 01:58:13 +0000	[thread overview]
Message-ID: <sashiko-outbox-219917@kernel.org> (raw)
In-Reply-To: <20261116-vsock-connect-close-v1-1-43fb125973dd@meta.com>

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] vsock: incomplete handling of post-handshake reset in
  vsock_connect()
--

commit bfeaeec883913ff39b46b5892948bd62e612d57c
Author: Bobby Eshleman <bobbyeshleman@meta.com>

vsock: only undo SS_CONNECTING when connect() fails

This commit introduces vsock_connect_close() so that vsock_connect() only
resets sock->state to SS_UNCONNECTED if the socket is still in
SS_CONNECTING.

Link: https://lore.kernel.org/netdev/20260909-vsock-connect-reset-closing-v1-1-50298b9ccfbf@rbox.co/

> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index 1d7d53542724f..6395c6a7b0b1e 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -1704,6 +1704,16 @@ static void vsock_connect_timeout(struct work_struct *work)
>  	sock_put(sk);
>  }
>  
> +/* Avoid breaking the socket when another thread has changed its sock->state
> + * while we were asleep.
> + */
> +static void vsock_connect_close(struct socket *sock)
> +{
> +	sock->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 +1872,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 +1886,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);

[Severity: Medium]
Can vsock_connect() hang until connect_timeout or corrupt vvs->bytes_unsent
when a socket completes its handshake and is then reset to TCP_CLOSE while
vsock_connect() is sleeping?

CPU0                                CPU1
vsock_connect()
  release_sock(sk)
  schedule_timeout(timeout)
                                    /* handshake completes */
                                    sock->state = SS_CONNECTED
                                    sk->sk_state = TCP_ESTABLISHED

                                    vmci_transport_handle_detach()
                                      sk->sk_state = TCP_CLOSE
  lock_sock(sk)
  if (sk->sk_state == TCP_ESTABLISHED ||
      sk->sk_state == TCP_CLOSING)  <-- false
  if (signal_pending(current) ||
      timeout == 0)                 <-- false
  /* loops back to schedule_timeout() */

When vmci_transport_handle_detach() runs after the socket has already
entered TCP_ESTABLISHED, it sets sk->sk_state = TCP_CLOSE without setting
sk->sk_err:

net/vmw_vsock/vmci_transport.c:vmci_transport_handle_detach() {
    ...
		if (vsk->local_addr.svm_cid == VMADDR_CID_HOST ||
		    vsock_stream_has_data(vsk) <= 0) {
			if (sk->sk_state == TCP_SYN_SENT) {
				...
				sk->sk_state = TCP_CLOSE;
				sk->sk_err = ECONNRESET;
				sk_error_report(sk);
				return;
			}
			sk->sk_state = TCP_CLOSE;
		}
    ...
}

Because the wait loop only checks for TCP_ESTABLISHED, TCP_CLOSING, and
sk->sk_err, vsock_connect() stays in the loop and sleeps on the closed
socket until connect_timeout expires.

Also, if a signal or timeout coincides with a post-handshake reset to
TCP_CLOSE (via vmci_transport_handle_detach() or
virtio_vsock_reset_sock()), vsock_connect() enters the signal/timeout path
and calls vsock_transport_cancel_pkt(vsk) on a socket in SS_CONNECTED.  If
another thread sent data after the handshake completed,
virtio_transport_purge_skbs() frees queued VIRTIO_VSOCK_OP_RW packets
without decrementing vvs->bytes_unsent, breaking SIOCOUTQ and
vsock_linger() accounting.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261116-vsock-connect-close-v1-1-43fb125973dd@meta.com?part=1

      parent reply	other threads:[~2026-11-18  1:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17  1:57 [PATCH net] vsock: only undo SS_CONNECTING when connect() fails Bobby Eshleman
2026-11-17  2:01 ` Bobby Eshleman
2026-11-17  2:02 ` netdev-bot+sinfo
2026-11-18  1:58 ` sashiko-bot [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=sashiko-outbox-219917@kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=bobbyeshleman@meta.com \
    --cc=eperezma@redhat.com \
    --cc=mst@redhat.com \
    --cc=sashiko-reviews@lists.linux.dev \
    --cc=virtualization@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.