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)
commitfa0f61f05e401a3295b6486df67bb3f9d5f24a94
tree05cbdb64326004290d181920b413461db0f4a6ac
parent392025f87a5105c640cf1b4b317c21c14c05a6f9
netfilter: nf_conntrack: fix nf_conntrack_l3proto_register

Before commit 2c352f444ccfa966a1aa4fd8e9ee29381c467448
(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