diff options
| author | Stefano Garzarella <sgarzare@redhat.com> | 2019-11-14 10:57:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-14 18:12:18 -0800 |
| commit | 36c5b48b91ac56762ef87e4af76350ed50f119b5 (patch) | |
| tree | b647773d8a6e2ea023cfec82be93d32265a22b79 /net/vmw_vsock | |
| parent | 6a2c0962105ae8ceba182c4f616e0e41d7755591 (diff) | |
| download | linux-36c5b48b91ac56762ef87e4af76350ed50f119b5.tar.gz linux-36c5b48b91ac56762ef87e4af76350ed50f119b5.tar.bz2 linux-36c5b48b91ac56762ef87e4af76350ed50f119b5.zip | |
vsock: fix bind() behaviour taking care of CID
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>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 5cb0ae42d916..cc8659838bf2 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; } |