diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-06-21 10:19:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-06-22 12:59:43 +0100 |
| commit | f302d180c6d430ea99643b9b2b3407aedaa36703 (patch) | |
| tree | 986eaa808366960626098ce15fd901f29716be6c /net/unix/diag.c | |
| parent | 340c3d337119ea177a98338be2e3bc62ee87ac80 (diff) | |
| download | linux-stable-f302d180c6d430ea99643b9b2b3407aedaa36703.tar.gz linux-stable-f302d180c6d430ea99643b9b2b3407aedaa36703.tar.bz2 linux-stable-f302d180c6d430ea99643b9b2b3407aedaa36703.zip | |
af_unix: Include the whole hash table size in UNIX_HASH_SIZE.
Currently, the size of AF_UNIX hash table is UNIX_HASH_SIZE * 2,
the first half for bind()ed sockets and the second half for unbound
ones. UNIX_HASH_SIZE * 2 is used to define the table and iterate
over it.
In some places, we use ARRAY_SIZE(unix_socket_table) instead of
UNIX_HASH_SIZE * 2. However, we cannot use it anymore because we
will allocate the hash table dynamically. Then, we would have to
add UNIX_HASH_SIZE * 2 in many places, which would be troublesome.
This patch adapts the UNIX_HASH_SIZE definition to include bound
and unbound sockets and defines a new UNIX_HASH_MOD macro to ease
calculations.
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index 4e3dc8179fa4..c5d1cca72aa5 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -204,9 +204,7 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) s_slot = cb->args[0]; num = s_num = cb->args[1]; - for (slot = s_slot; - slot < ARRAY_SIZE(unix_socket_table); - s_num = 0, slot++) { + for (slot = s_slot; slot < UNIX_HASH_SIZE; s_num = 0, slot++) { struct sock *sk; num = 0; @@ -242,7 +240,7 @@ static struct sock *unix_lookup_by_ino(unsigned int ino) struct sock *sk; int i; - for (i = 0; i < ARRAY_SIZE(unix_socket_table); i++) { + for (i = 0; i < UNIX_HASH_SIZE; i++) { spin_lock(&unix_table_locks[i]); sk_for_each(sk, &unix_socket_table[i]) if (ino == sock_i_ino(sk)) { |