diff options
| author |   Peilin Ye <peilin.ye@bytedance.com> | 2022-08-08 11:05:25 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-08-10 09:50:18 +0100 |
| commit | a3e7b29e30854ed67be0d17687e744ad0c769c4b (patch) | |
| tree | 2dc887bf6b130804f3bbbba6136f0a8cc6ca52cb | |
| parent | vsock: Fix memory leak in vsock_connect() (diff) | |
| download | linux-dev-a3e7b29e30854ed67be0d17687e744ad0c769c4b.tar.xz linux-dev-a3e7b29e30854ed67be0d17687e744ad0c769c4b.zip | |
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: Stefano Garzarella <sgarzare@redhat.com>
Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Peilin Ye <peilin.ye@bytedance.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 4d68681f5abe..b4ee163154a6 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -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); |