]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: nf_conntrack: fix nf_conntrack_l3proto_register
authorGao feng <gaofeng@cn.fujitsu.com>
Thu, 21 Jun 2012 04:36:38 +0000 (04:36 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 27 Jun 2012 16:11:15 +0000 (18:11 +0200)
commit5db047909e08425ce3b22846e27cbd72ae42fd8b
tree05cbdb64326004290d181920b413461db0f4a6ac
parentab4e9243784410354173d41e6ad8c7a5e0d2ed5a
netfilter: nf_conntrack: fix nf_conntrack_l3proto_register

Before commit c1dfb81ebe045b5141f6e648766a3c45b47d9b92
(netfilter: nf_conntrack: prepare namespace support for
l4 protocol trackers), we register sysctl before register
protocol tracker. Thus, if sysctl is registration fails,
the protocol tracker will not be registered.

After that commit, if sysctl registration fails, protocol
registration still remains, so we leave things in intermediate
state.

To fix this, this patch registers sysctl before protocols.
And if protocol registration fail, sysctl is unregistered.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_proto.c