inetpeer: randomize RB-tree node comparison using SipHash
Subsystems (3)
PATCH v3 1/1 inetpeer: randomize RB-tree node comparison using SipHash
The inetpeer rate limiting system stores peer entries in a Red-Black tree keyed deterministically on the remote IP address. Because tree lookups walk the RB-tree using standard lexicographical comparisons (inetpeer_addr_cmp), an off-path adversary can predict the exact topology of the tree and the sequence of nodes traversed during lookups (the gc_stack candidate list).
By combining deterministic tree traversal with aggressive garbage collection (triggered when tree size exceeds inet_peer_threshold), an attacker can selectively force the eviction of targeted inet_peer nodes. When an evicted node is subsequently re-created upon receiving a new packet, its rate-limiting token bucket (rate_tokens, rate_last) is reset to full capacity. This creates a side-channel primitive allowing off-path attackers to bypass IP-keyed ICMP rate limits and infer open UDP ports (similar to SAD DNS style attacks).
Mitigate this by randomizing the RB-tree node comparison logic using SipHash with a secret key (inetpeer_hash_key) initialized via net_get_random_once(). Nodes are ordered in the tree by SipHash(addr, key) rather than raw IP addresses. Because the secret key is unknown to external entities, the tree layout and lookup traversal paths are unpredictable to off-path adversaries, breaking the deterministic eviction gadget.
Cache the computed 64-bit SipHash (hash) in struct inet_peer and compute the target hash (dhash) once at the beginning of inet_getpeer() to avoid recomputing SipHash at every step of the RB-tree walk.
---
v3: Properly rebase v2 (Ido)
include/net/inetpeer.h | 4 ++++ net/ipv4/inetpeer.c | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-)
include/net/inetpeer.h +4 -0
@@ -35,6 +35,7 @@ struct inetpeer_addr {struct inet_peer {struct rb_node rb_node; +u64 hash;struct inetpeer_addr daddr;u32 metrics[RTAX_MAX ];
@@ -125,6 +126,9 @@ static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a, {int i, n; +if (a->family != b->family) +return a->family < b->family ?-1 :1 ; +if (a->family ==AF_INET ) n =sizeof (a->a4) /sizeof (u32);else
net/ipv4/inetpeer.c +35 -3
@@ -21,6 +21,7 @@#include <net/ip.h> #include <net/inetpeer.h> #include <net/secure_seq.h> +#include <linux/siphash.h> /* * Theory of operations.
@@ -52,6 +53,34 @@*/ static struct kmem_cache *peer_cachep__ro_after_init ; +static siphash_aligned_key_t inetpeer_hash_key__read_mostly ; + +static u64 inetpeer_addr_hash (const struct inetpeer_addr *a) +{ +net_get_random_once (&inetpeer_hash_key,sizeof (inetpeer_hash_key)); + +if (a->family ==AF_INET ) +return siphash_2u32 ((__force u32 )a->a4.addr, a->a4.vif, + &inetpeer_hash_key); + +return siphash_4u32 ((__force u32 )a->a6.s6_addr32[0 ], + (__force u32 )a->a6.s6_addr32[1 ], + (__force u32 )a->a6.s6_addr32[2 ], + (__force u32 )a->a6.s6_addr32[3 ], + &inetpeer_hash_key); +} + +static int inetpeer_entry_cmp (u64 dhash, +const struct inetpeer_addr *daddr, +const struct inet_peer *p) +{ +if (dhash < p->hash) +return -1 ; +if (dhash > p->hash) +return 1 ; + +return inetpeer_addr_cmp (daddr, &p->daddr); +}void inet_peer_base_init (struct inet_peer_base *bp) {
@@ -84,6 +113,7 @@ void __init inet_initpeers(void)/* Called with rcu_read_lock() or base->lock held */ static struct inet_peer *lookup(const struct inetpeer_addr *daddr, + u64 dhash, struct inet_peer_base *base, unsigned int seq, struct inet_peer *gc_stack[],
@@ -105,7 +135,7 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,break ; parent = next; p = rb_entry(parent, struct inet_peer, rb_node); - cmp =inetpeer_addr_cmp (daddr, &p->daddr); + cmp =inetpeer_entry_cmp (dhash, daddr, p);if (cmp ==0 ) { now = jiffies;if (READ_ONCE (p->dtime) != now)
@@ -170,6 +200,7 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base, const struct inetpeer_addr *daddr) {struct inet_peer *p, *gc_stack[PEER_MAX_GC ]; +u64 dhash =inetpeer_addr_hash (daddr);struct rb_node **pp, *parent;unsigned int gc_cnt, seq;
@@ -177,7 +208,7 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,* Because of a concurrent writer, we might not find an existing entry. */ seq =read_seqbegin (&base->lock); - p =lookup (daddr, base, seq,NULL , &gc_cnt, &parent, &pp); + p =lookup (daddr, dhash, base, seq,NULL , &gc_cnt, &parent, &pp);/* Make sure tree was not modified during our lookup. */ if (p && !read_seqretry (&base->lock, seq))
@@ -190,11 +221,12 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,write_seqlock_bh (&base->lock); gc_cnt =0 ; - p =lookup (daddr, base, seq, gc_stack, &gc_cnt, &parent, &pp); + p =lookup (daddr, dhash, base, seq, gc_stack, &gc_cnt, &parent, &pp);if (!p) { p =kmem_cache_alloc (peer_cachep,GFP_ATOMIC );if (p) { p->daddr = *daddr; + p->hash = dhash; p->dtime = (__u32 )jiffies;refcount_set (&p->refcnt,1 );atomic_set (&p->rid,0 );
Signature · 1 line
2.55.0.737.g08866a6d13-goog
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 14 lines · On Tue, 18 Aug 2026 15:12:13 +0000 you wrote:
The inetpeer rate limiting system stores peer entries in a Red-Black tree keyed deterministically on the remote IP address. Because tree lookups walk the RB-tree using standard lexicographical comparisons (
inetpeer_addr_cmp), an off-path adversary can predict the exact topology of the tree and the sequence of nodes traversed during lookups (thegc_stackcandidate list).By combining deterministic tree traversal with aggressive garbage collection (triggered when tree size exceeds
inet_peer_threshold), an attacker can selectively force the eviction of targetedinet_peernodes. When an evicted node is subsequently re-created upon receiving a new packet, its rate-limiting token bucket (rate_tokens,rate_last) is reset to full capacity. This creates a side-channel primitive allowing off-path attackers to bypass IP-keyed ICMP rate limits and infer open UDP ports (similar to SAD DNS style attacks).
Quoted 1 line
[...]
Here is the summary with links:
- [v3,net] inetpeer: randomize RB-tree node comparison using SipHash
https://git.kernel.org/netdev/net/c/2ee66e948717
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html