lkml.org 
[lkml]   [2019]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 14/14] vsock: fix bind() behaviour taking care of CID
    Date
    When we are looking for a socket bound to a specific address,
    we also have to take into account the CID.

    This patch is useful with multi-transports support because it
    allows the binding of the same port with different CID, and
    it prevents a connection to a wrong socket bound to the same
    port, but with different CID.

    Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
    Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
    ---
    net/vmw_vsock/af_vsock.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
    index 1f2e707cae66..7183de277072 100644
    --- a/net/vmw_vsock/af_vsock.c
    +++ b/net/vmw_vsock/af_vsock.c
    @@ -228,10 +228,16 @@ static struct sock *__vsock_find_bound_socket(struct sockaddr_vm *addr)
    {
    struct vsock_sock *vsk;

    - list_for_each_entry(vsk, vsock_bound_sockets(addr), bound_table)
    - if (addr->svm_port == vsk->local_addr.svm_port)
    + list_for_each_entry(vsk, vsock_bound_sockets(addr), bound_table) {
    + if (vsock_addr_equals_addr(addr, &vsk->local_addr))
    return sk_vsock(vsk);

    + if (addr->svm_port == vsk->local_addr.svm_port &&
    + (vsk->local_addr.svm_cid == VMADDR_CID_ANY ||
    + addr->svm_cid == VMADDR_CID_ANY))
    + return sk_vsock(vsk);
    + }
    +
    return NULL;
    }

    --
    2.21.0
    \
     
     \ /
      Last update: 2019-10-23 11:59    [W:2.821 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site