Commit 11e2f8dc authored by Linus Torvalds's avatar Linus Torvalds Committed by Ben Hutchings

nf_conntrack: avoid kernel pointer value leak in slab name

commit 31b0b385 upstream.

The slab name ends up being visible in the directory structure under
/sys, and even if you don't have access rights to the file you can see
the filenames.

Just use a 64-bit counter instead of the pointer to the 'net' structure
to generate a unique name.

This code will go away in 4.7 when the conntrack code moves to a single
kmemcache, but this is the backportable simple solution to avoiding
leaking kernel pointers to user space.

Fixes: 5b3501fa ("netfilter: nf_conntrack: per netns nf_conntrack_cachep")
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 43f7ff72
...@@ -1791,6 +1791,7 @@ void nf_conntrack_init_end(void) ...@@ -1791,6 +1791,7 @@ void nf_conntrack_init_end(void)
int nf_conntrack_init_net(struct net *net) int nf_conntrack_init_net(struct net *net)
{ {
static atomic64_t unique_id;
int ret = -ENOMEM; int ret = -ENOMEM;
int cpu; int cpu;
...@@ -1814,7 +1815,8 @@ int nf_conntrack_init_net(struct net *net) ...@@ -1814,7 +1815,8 @@ int nf_conntrack_init_net(struct net *net)
if (!net->ct.stat) if (!net->ct.stat)
goto err_pcpu_lists; goto err_pcpu_lists;
net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net); net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%llu",
(u64)atomic64_inc_return(&unique_id));
if (!net->ct.slabname) if (!net->ct.slabname)
goto err_slabname; goto err_slabname;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment