Skip to content

Commit 4c2c8f0

Browse files
wtarreaukuba-moo
authored andcommitted
tcp: increase source port perturb table to 2^16
Moshe Kol, Amit Klein, and Yossi Gilad reported being able to accurately identify a client by forcing it to emit only 40 times more connections than there are entries in the table_perturb[] table. The previous two improvements consisting in resalting the secret every 10s and adding randomness to each port selection only slightly improved the situation, and the current value of 2^8 was too small as it's not very difficult to make a client emit 10k connections in less than 10 seconds. Thus we're increasing the perturb table from 2^8 to 2^16 so that the same precision now requires 2.6M connections, which is more difficult in this time frame and harder to hide as a background activity. The impact is that the table now uses 256 kB instead of 1 kB, which could mostly affect devices making frequent outgoing connections. However such components usually target a small set of destinations (load balancers, database clients, perf assessment tools), and in practice only a few entries will be visited, like before. A live test at 1 million connections per second showed no performance difference from the previous value. Reported-by: Moshe Kol <[email protected]> Reported-by: Yossi Gilad <[email protected]> Reported-by: Amit Klein <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: Willy Tarreau <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e926147 commit 4c2c8f0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

net/ipv4/inet_hashtables.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -726,11 +726,12 @@ EXPORT_SYMBOL_GPL(inet_unhash);
726726
* Note that we use 32bit integers (vs RFC 'short integers')
727727
* because 2^16 is not a multiple of num_ephemeral and this
728728
* property might be used by clever attacker.
729-
* RFC claims using TABLE_LENGTH=10 buckets gives an improvement,
730-
* we use 256 instead to really give more isolation and
731-
* privacy, this only consumes 1 KB of kernel memory.
729+
* RFC claims using TABLE_LENGTH=10 buckets gives an improvement, though
730+
* attacks were since demonstrated, thus we use 65536 instead to really
731+
* give more isolation and privacy, at the expense of 256kB of kernel
732+
* memory.
732733
*/
733-
#define INET_TABLE_PERTURB_SHIFT 8
734+
#define INET_TABLE_PERTURB_SHIFT 16
734735
#define INET_TABLE_PERTURB_SIZE (1 << INET_TABLE_PERTURB_SHIFT)
735736
static u32 *table_perturb;
736737

0 commit comments

Comments
 (0)