netfilter: decnet: only register hooks in init namespace

Florian Westphal · ummakynes · commit 1a0ed0ad4812 · 2017-04-26T09:30:21.000+02:00
looks like decnet isn't namespacified in first place, so restrict hook
registration to the initial namespace.

Prepares for eventual removal of legacy nf_register_hook() api.

Signed-off-by: Florian Westphal &lt;fw@strlen.de&gt;
Signed-off-by: Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
@@ -134,7 +134,7 @@ static int __init dn_rtmsg_init(void)
 		return -ENOMEM;
 	}
 
-	rv = nf_register_hook(&dnrmg_ops);
+	rv = nf_register_net_hook(&init_net, &dnrmg_ops);
 	if (rv) {
 		netlink_kernel_release(dnrmg);
 	}
@@ -144,7 +144,7 @@ static int __init dn_rtmsg_init(void)
 
 static void __exit dn_rtmsg_fini(void)
 {
-	nf_unregister_hook(&dnrmg_ops);
+	nf_unregister_net_hook(&init_net, &dnrmg_ops);
 	netlink_kernel_release(dnrmg);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ static int __init dn_rtmsg_init(void)`
`134`	`134`	`return -ENOMEM;`
`135`	`135`	`}`
`136`	`136`
`137`		`- rv = nf_register_hook(&dnrmg_ops);`
	`137`	`+ rv = nf_register_net_hook(&init_net, &dnrmg_ops);`
`138`	`138`	`if (rv) {`
`139`	`139`	`netlink_kernel_release(dnrmg);`
`140`	`140`	`}`
`@@ -144,7 +144,7 @@ static int __init dn_rtmsg_init(void)`
`144`	`144`
`145`	`145`	`static void __exit dn_rtmsg_fini(void)`
`146`	`146`	`{`
`147`		`- nf_unregister_hook(&dnrmg_ops);`
	`147`	`+ nf_unregister_net_hook(&init_net, &dnrmg_ops);`
`148`	`148`	`netlink_kernel_release(dnrmg);`
`149`	`149`	`}`
`150`	`150`