lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 135/266] vsock: notify server to shutdown when client has pending signal
    Date
    From: Longpeng(Mike) <longpeng2@huawei.com>

    [ Upstream commit c7ff9cff70601ea19245d997bb977344663434c7 ]

    The client's sk_state will be set to TCP_ESTABLISHED if the server
    replay the client's connect request.

    However, if the client has pending signal, its sk_state will be set
    to TCP_CLOSE without notify the server, so the server will hold the
    corrupt connection.

    client server

    1. sk_state=TCP_SYN_SENT |
    2. call ->connect() |
    3. wait reply |
    | 4. sk_state=TCP_ESTABLISHED
    | 5. insert to connected list
    | 6. reply to the client
    7. sk_state=TCP_ESTABLISHED |
    8. insert to connected list |
    9. *signal pending* <--------------------- the user kill client
    10. sk_state=TCP_CLOSE |
    client is exiting... |
    11. call ->release() |
    virtio_transport_close
    if (!(sk->sk_state == TCP_ESTABLISHED ||
    sk->sk_state == TCP_CLOSING))
    return true; *return at here, the server cannot notice the connection is corrupt*

    So the client should notify the peer in this case.

    Cc: David S. Miller <davem@davemloft.net>
    Cc: Jakub Kicinski <kuba@kernel.org>
    Cc: Jorgen Hansen <jhansen@vmware.com>
    Cc: Norbert Slusarek <nslusarek@gmx.net>
    Cc: Andra Paraschiv <andraprs@amazon.com>
    Cc: Colin Ian King <colin.king@canonical.com>
    Cc: David Brazdil <dbrazdil@google.com>
    Cc: Alexander Popov <alex.popov@linux.com>
    Suggested-by: Stefano Garzarella <sgarzare@redhat.com>
    Link: https://lkml.org/lkml/2021/5/17/418
    Signed-off-by: lixianming <lixianming5@huawei.com>
    Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
    Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/vmw_vsock/af_vsock.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
    index 92a72f0e0d94..ae11311807fd 100644
    --- a/net/vmw_vsock/af_vsock.c
    +++ b/net/vmw_vsock/af_vsock.c
    @@ -1369,7 +1369,7 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,

    if (signal_pending(current)) {
    err = sock_intr_errno(timeout);
    - sk->sk_state = TCP_CLOSE;
    + sk->sk_state = sk->sk_state == TCP_ESTABLISHED ? TCP_CLOSING : TCP_CLOSE;
    sock->state = SS_UNCONNECTED;
    vsock_transport_cancel_pkt(vsk);
    goto out_wait;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:39    [W:4.022 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site