Commit a3e7b29e authored by Peilin Ye's avatar Peilin Ye Committed by David S. Miller
Browse files

vsock: Set socket state back to SS_UNCONNECTED in vsock_connect_timeout() 



Imagine two non-blocking vsock_connect() requests on the same socket.
The first request schedules @connect_work, and after it times out,
vsock_connect_timeout() sets *sock* state back to TCP_CLOSE, but keeps
*socket* state as SS_CONNECTING.

Later, the second request returns -EALREADY, meaning the socket "already
has a pending connection in progress", even though the first request has
already timed out.

As suggested by Stefano, fix it by setting *socket* state back to
SS_UNCONNECTED, so that the second request will return -ETIMEDOUT.

Suggested-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Fixes: d021c344 ("VSOCK: Introduce VM Sockets")
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarPeilin Ye <peilin.ye@bytedance.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e97cfed

net/vmw_vsock/af_vsock.c

+1 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,7 @@ static void vsock_connect_timeout(struct work_struct *work) 
	if (sk->sk_state == TCP_SYN_SENT &&

	    (sk->sk_shutdown != SHUTDOWN_MASK)) {

		sk->sk_state = TCP_CLOSE;

		sk->sk_socket->state = SS_UNCONNECTED;

		sk->sk_err = ETIMEDOUT;

		sk_error_report(sk);

		vsock_transport_cancel_pkt(vsk);