Commit 639e077b authored Dec 07, 2015 by Nikolay Borisov Committed by Pablo Neira Ayuso Dec 09, 2015

netfilter: nfnetlink_queue: Unregister pernet subsys in case of init failure



Commit 3bfe0498 ("netfilter: nfnetlink_{log,queue}:
Register pernet in first place") reorganised the initialisation
order of the pernet_subsys to avoid "use-before-initialised"
condition. However, in doing so the cleanup logic in nfnetlink_queue
got botched in that the pernet_subsys wasn't cleaned in case
nfnetlink_subsys_register failed. This patch adds the necessary
cleanup routine call.

Fixes: 3bfe0498 ("netfilter: nfnetlink_{log,queue}: Register pernet in first place")
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 8e662164

net/netfilter/nfnetlink_queue.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1419,6 +1419,7 @@ static int __init nfnetlink_queue_init(void)

		cleanup_netlink_notifier:
		netlink_unregister_notifier(&nfqnl_rtnl_notifier);
		unregister_pernet_subsys(&nfnl_queue_net_ops);
		out:
		return status;
		}