diff options
| author | Eric Dumazet | 2019-03-27 16:21:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-17 08:38:40 +0200 |
| commit | a1c2f3229734a4bb8d5ac008c0a67e025aa11547 (patch) | |
| tree | 30982adf30a3fd852de5448330bfaca834f64fba /net/core | |
| parent | net/mlx5: Decrease default mr cache size (diff) | |
| download | kernel-qcow2-linux-a1c2f3229734a4bb8d5ac008c0a67e025aa11547.tar.gz kernel-qcow2-linux-a1c2f3229734a4bb8d5ac008c0a67e025aa11547.tar.xz kernel-qcow2-linux-a1c2f3229734a4bb8d5ac008c0a67e025aa11547.zip | |
netns: provide pure entropy for net_hash_mix()
[ Upstream commit 355b98553789b646ed97ad801a619ff898471b92 ]
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: 0b4419162aa6 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/net_namespace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 670c84b1bfc2..7320f0844a50 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -304,6 +304,7 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) refcount_set(&net->count, 1); refcount_set(&net->passive, 1); + get_random_bytes(&net->hash_mix, sizeof(u32)); net->dev_base_seq = 1; net->user_ns = user_ns; idr_init(&net->netns_ids); |