Skip to contentSkip to conversation

netfilter: decnet: only register hooks in init namespace

PATCH Applied Florian Westphal 2 participants 2 messages Apr 19, 2017 – Apr 24, 2017

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 netfilter: decnet: only register hooks in init namespace

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.

---
 net/decnet/netfilter/dn_rtmsg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/decnet/netfilter/dn_rtmsg.c +2 -2
index 85f2fdc360c2..f44303a40105 100644
@@ -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);
 }
 
Signature · 1 line
2.10.2
maintainer Applied
#1 lore raw
Quoted 4 lines · Florian Westphal

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.

Applied, thanks.