lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 193/229] vsock: Set socket state back to SS_UNCONNECTED in vsock_connect_timeout()
    Date
    From: Peilin Ye <peilin.ye@bytedance.com>

    commit a3e7b29e30854ed67be0d17687e744ad0c769c4b upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/vmw_vsock/af_vsock.c | 1 +
    1 file changed, 1 insertion(+)

    --- a/net/vmw_vsock/af_vsock.c
    +++ b/net/vmw_vsock/af_vsock.c
    @@ -1125,6 +1125,7 @@ static void vsock_connect_timeout(struct
    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->sk_error_report(sk);
    vsock_transport_cancel_pkt(vsk);

    \
     
     \ /
      Last update: 2022-08-23 12:17    [W:4.046 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site