netns: provide pure entropy for net_hash_mix()
net_hash_mix() currently uses kernel address of a struct net,
and is used in many places that could be used to reveal this
address to a patient attacker, thus defeating KASLR, for
the typical case (initial net namespace, &init_net is
not dynamically allocated)
I believe the original implementation tried to avoid spending
too many cycles in this function, but security comes first.
Also provide entropy regardless of CONFIG_NET_NS.
Fixes: 0b4419162a
("netns: introduce the net_hash_mix "salt" for hashes")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Amit Klein <aksecurity@gmail.com>
Reported-by: Benny Pinkas <benny@pinkas.net>
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
6289d0facd
commit
355b985537
@@ -2,16 +2,10 @@
|
||||
#ifndef __NET_NS_HASH_H__
|
||||
#define __NET_NS_HASH_H__
|
||||
|
||||
#include <asm/cache.h>
|
||||
|
||||
struct net;
|
||||
#include <net/net_namespace.h>
|
||||
|
||||
static inline u32 net_hash_mix(const struct net *net)
|
||||
{
|
||||
#ifdef CONFIG_NET_NS
|
||||
return (u32)(((unsigned long)net) >> ilog2(sizeof(*net)));
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
return net->hash_mix;
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user