]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8ab9d86059e5999d3ecf1ef48716f6e363cf7aca
tree56bb581898846b695eb9b1cd20556bb619924251
parentbd19488f4a5a46380a5bb3cee79e9e9d8e06adcd
netfilter: fix two recent sysctl problems

Starting with 2db2c5ee0af9aa07c4116e877e54cbcc80608c71 ("[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