aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2022-05-02 10:46:09 +0200
committerJakub Kicinski <kuba@kernel.org>2022-05-04 19:22:20 -0700
commit9e9b70ae923baf2b5e8a0ea4fd0c8451801ac526 (patch)
tree9c033e3c72e3a06f9e21db4470de505566af7049 /net/ipv4
parentsecure_seq: use the 64 bits of the siphash for port offset calculation (diff)
downloadlinux-dev-9e9b70ae923baf2b5e8a0ea4fd0c8451801ac526.tar.xz
linux-dev-9e9b70ae923baf2b5e8a0ea4fd0c8451801ac526.zip
tcp: use different parts of the port_offset for index and offset
Amit Klein suggests that we use different parts of port_offset for the table's index and the port offset so that there is no direct relation between them. Cc: Jason A. Donenfeld <Jason@zx2c4.com> Cc: Moshe Kol <moshe.kol@mail.huji.ac.il> Cc: Yossi Gilad <yossi.gilad@mail.huji.ac.il> Cc: Amit Klein <aksecurity@gmail.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/inet_hashtables.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 9d24d9319f3d..29c701cd8312 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -777,7 +777,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
net_get_random_once(table_perturb, sizeof(table_perturb));
index = hash_32(port_offset, INET_TABLE_PERTURB_SHIFT);
- offset = READ_ONCE(table_perturb[index]) + port_offset;
+ offset = READ_ONCE(table_perturb[index]) + (port_offset >> 32);
offset %= remaining;
/* In first pass we try ports of @low parity.