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

Commit 53c5de30 authored by Willy Tarreau's avatar Willy Tarreau Committed by Greg Kroah-Hartman
Browse files

tcp: use different parts of the port_offset for index and offset 



commit 9e9b70ae923baf2b5e8a0ea4fd0c8451801ac526 upstream.

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95921a3b

net/ipv4/inet_hashtables.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,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.