diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-03-27 18:21:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-17 09:38:40 +0300 |
| commit | a1c2f3229734a4bb8d5ac008c0a67e025aa11547 (patch) | |
| tree | 30982adf30a3fd852de5448330bfaca834f64fba /include/net/net_namespace.h | |
| parent | 53a1906859a2ec1d2b5c33102086ce3e03ec0b37 (diff) | |
| download | linux-a1c2f3229734a4bb8d5ac008c0a67e025aa11547.tar.xz | |
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 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 9b5fdc50519a..3f7b166262d7 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -57,6 +57,7 @@ struct net { */ spinlock_t rules_mod_lock; + u32 hash_mix; atomic64_t cookie_gen; struct list_head list; /* list of network namespaces */ |