lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 535/575] vsock: prevent unnecessary refcnt inc for nonblocking connect
    Date
    From: Eiichi Tsukata <eiichi.tsukata@nutanix.com>

    [ Upstream commit c7cd82b90599fa10915f41e3dd9098a77d0aa7b6 ]

    Currently vosck_connect() increments sock refcount for nonblocking
    socket each time it's called, which can lead to memory leak if
    it's called multiple times because connect timeout function decrements
    sock refcount only once.

    Fixes it by making vsock_connect() return -EALREADY immediately when
    sock state is already SS_CONNECTING.

    Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
    Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
    Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.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, 2 insertions(+)

    diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
    index 326250513570e..7fe36dbcbe187 100644
    --- a/net/vmw_vsock/af_vsock.c
    +++ b/net/vmw_vsock/af_vsock.c
    @@ -1279,6 +1279,8 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,
    * non-blocking call.
    */
    err = -EALREADY;
    + if (flags & O_NONBLOCK)
    + goto out;
    break;
    default:
    if ((sk->sk_state == TCP_LISTEN) ||
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 03:11    [W:4.123 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site