From: Eric Dumazet <[email protected]>

Even when implementing RFC 6056 3.3.4 (Algorithm 4: Double-Hash
Port Selection Algorithm), a patient attacker could still be able
to collect enough state from an otherwise idle host.

Idea of this patch is to inject some noise, in the
cases __inet_hash_connect() found a candidate in the first
attempt.

This noise should not significantly reduce the collision
avoidance, and should be zero if connection table
is already well used.

Note that this is not implementing RFC 6056 3.3.5
because we think Algorithm 5 could hurt typical
workloads.

Signed-off-by: Eric Dumazet <[email protected]>
Cc: David Dworken <[email protected]>
Cc: Willem de Bruijn <[email protected]>
---
 net/ipv4/inet_hashtables.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 
12808dac923a4c29cb152201140757c69ba165e5..c96866a53a664601fdb8904f486cc590675ae34f
 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -818,6 +818,11 @@ int __inet_hash_connect(struct inet_timewait_death_row 
*death_row,
        return -EADDRNOTAVAIL;
 
 ok:
+       /* If our first attempt found a candidate, skip next candidate
+        * in 1/16 of cases to add some noise.
+        */
+       if (!i && !(prandom_u32() % 16))
+               i = 2;
        WRITE_ONCE(table_perturb[index], READ_ONCE(table_perturb[index]) + i + 
2);
 
        /* Head lock still held and bh's disabled */
-- 
2.30.0.478.g8a0d178c01-goog

Reply via email to