Skip to content

Commit

Permalink
ipv6: switch inet6_acaddr_hash() to less predictable hash
Browse files Browse the repository at this point in the history
commit 2384d02 ("net/ipv6: Add anycast addresses to a global hashtable")
added inet6_acaddr_hash(), using ipv6_addr_hash() and net_hash_mix()
to get hash spreading for typical users.

However ipv6_addr_hash() is highly predictable and a malicious user
could abuse a specific hash bucket.

Switch to __ipv6_addr_jhash(). We could use a dedicated
secret, or reuse net_hash_mix() as I did in this patch.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20241008121307.800040-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Eric Dumazet authored and Jakub Kicinski committed Oct 10, 2024
1 parent 4a0ec2a commit 4daf4dc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/ipv6/anycast.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ static DEFINE_SPINLOCK(acaddr_hash_lock);

static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr);

static u32 inet6_acaddr_hash(struct net *net, const struct in6_addr *addr)
static u32 inet6_acaddr_hash(const struct net *net,
const struct in6_addr *addr)
{
u32 val = ipv6_addr_hash(addr) ^ net_hash_mix(net);
u32 val = __ipv6_addr_jhash(addr, net_hash_mix(net));

return hash_32(val, IN6_ADDR_HSIZE_SHIFT);
}
Expand Down

0 comments on commit 4daf4dc

Please sign in to comment.