Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a49dd9dc authored by Asias He's avatar Asias He Committed by David S. Miller
Browse files

VSOCK: Fix VSOCK_HASH and VSOCK_CONN_HASH 



If we mod with VSOCK_HASH_SIZE -1, we get 0, 1, .... 249.  Actually, we
have vsock_bind_table[0 ... 250] and vsock_connected_table[0 .. 250].
In this case the last entry will never be used.

We should mod with VSOCK_HASH_SIZE instead.

Signed-off-by: default avatarAsias He <asias@redhat.com>
Acked-by: default avatarAndy King <acking@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fc93246

net/vmw_vsock/af_vsock.c

+3 −3
Original line number Diff line number Diff line
@@ -144,18 +144,18 @@ EXPORT_SYMBOL_GPL(vm_sockets_get_local_cid); 
 * VSOCK_HASH_SIZE + 1 so that vsock_bind_table[0] through

 * vsock_bind_table[VSOCK_HASH_SIZE - 1] are for bound sockets and

 * vsock_bind_table[VSOCK_HASH_SIZE] is for unbound sockets.  The hash function

 * mods with VSOCK_HASH_SIZE - 1 to ensure this.

 * mods with VSOCK_HASH_SIZE to ensure this.

 */

#define VSOCK_HASH_SIZE         251

#define MAX_PORT_RETRIES        24



#define VSOCK_HASH(addr)        ((addr)->svm_port % (VSOCK_HASH_SIZE - 1))

#define VSOCK_HASH(addr)        ((addr)->svm_port % VSOCK_HASH_SIZE)

#define vsock_bound_sockets(addr) (&vsock_bind_table[VSOCK_HASH(addr)])

#define vsock_unbound_sockets     (&vsock_bind_table[VSOCK_HASH_SIZE])



/* XXX This can probably be implemented in a better way. */

#define VSOCK_CONN_HASH(src, dst)				\

	(((src)->svm_cid ^ (dst)->svm_port) % (VSOCK_HASH_SIZE - 1))

	(((src)->svm_cid ^ (dst)->svm_port) % VSOCK_HASH_SIZE)

#define vsock_connected_sockets(src, dst)		\

	(&vsock_connected_table[VSOCK_CONN_HASH(src, dst)])

#define vsock_connected_sockets_vsk(vsk)				\