Skip to content

Commit 6ff8315

Browse files
torvaldsgregkh
authored andcommitted
nf_conntrack: avoid kernel pointer value leak in slab name
commit 31b0b385f69d8d5491a4bca288e25e63f1d945d0 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: 5b3501f ("netfilter: nf_conntrack: per netns nf_conntrack_cachep") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 62b6836 commit 6ff8315

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

net/netfilter/nf_conntrack_core.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,6 +1757,7 @@ void nf_conntrack_init_end(void)
17571757

17581758
int nf_conntrack_init_net(struct net *net)
17591759
{
1760+
static atomic64_t unique_id;
17601761
int ret = -ENOMEM;
17611762
int cpu;
17621763

@@ -1779,7 +1780,8 @@ int nf_conntrack_init_net(struct net *net)
17791780
if (!net->ct.stat)
17801781
goto err_pcpu_lists;
17811782

1782-
net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
1783+
net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%llu",
1784+
(u64)atomic64_inc_return(&unique_id));
17831785
if (!net->ct.slabname)
17841786
goto err_slabname;
17851787

0 commit comments

Comments
 (0)