netfilter: fix two recent sysctl problems
authorKrzysztof Piotr Oledzki <ole@ans.pl>
Wed, 6 Aug 2008 09:35:44 +0000 (02:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2008 09:35:44 +0000 (02:35 -0700)
commit9714be7da8b32f36d2468fe08ff603b6402df8cf
tree56bb581898846b695eb9b1cd20556bb619924251
parent1ca615fb816ba85dc765209a9b58ab82cc99bce0
netfilter: fix two recent sysctl problems

Starting with 9043476f726802f4b00c96d0c4f418dde48d1304 ("[PATCH]
sanitize proc_sysctl") we have two netfilter releated problems:

 - WARNING: at kernel/sysctl.c:1966 unregister_sysctl_table+0xcc/0x103(),
   caused by wrong order of ini/fini calls

 - net.netfilter is duplicated and has truncated set of records

Thanks to very useful guidelines from Al Viro, this patch fixes both
of them.

Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_standalone.c