Skip to contentSkip to conversation

ipv6: do not allow ipv6 module to be removed

RFC PATCH In review Cong Wang 2 participants 4 messages Sep 4, 2013 – Sep 6, 2013

Subsystems (2)
lore
Share & tools
lore

Cong Wang

author
#0 lore raw

RFC PATCH 1/1 ipv6: do not allow ipv6 module to be removed

There was some bug report on ipv6 module removal path before. Also, as Stephen pointed out, after vxlan module gets ipv6 support, the ipv6 stub it used is not safe against this module removal either. So, let's just remove inet6_exit() so that ipv6 module will not be able to be unloaded.

Cc Hideaki YOSHIFUJI <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc David S. Miller <[email protected]>

---

net/ipv6/af_inet6.c +0 -47
index 136fe55..ad584eb 100644
@@ -1023,51 +1023,4 @@ out_unregister_tcp_proto:
 }
 module_init(inet6_init);
 
-static void __exit inet6_exit(void)
-{
-	if (disable_ipv6_mod)
-		return;
-
-	/* First of all disallow new sockets creation. */
-	sock_unregister(PF_INET6);
-	/* Disallow any further netlink messages */
-	rtnl_unregister_all(PF_INET6);
-
-	udpv6_exit();
-	udplitev6_exit();
-	tcpv6_exit();
-
-	/* Cleanup code parts. */
-	ipv6_packet_cleanup();
-	ipv6_frag_exit();
-	ipv6_exthdrs_exit();
-	addrconf_cleanup();
-	ip6_flowlabel_cleanup();
-	ip6_route_cleanup();
-#ifdef CONFIG_PROC_FS
-
-	/* Cleanup code parts. */
-	if6_proc_exit();
-	ipv6_misc_proc_exit();
-	udplite6_proc_exit();
-	raw6_proc_exit();
-#endif
-	ipv6_netfilter_fini();
-	ipv6_stub = NULL;
-	igmp6_cleanup();
-	ndisc_cleanup();
-	ip6_mr_cleanup();
-	icmpv6_cleanup();
-	rawv6_exit();
-
-	unregister_pernet_subsys(&inet6_net_ops);
-	proto_unregister(&rawv6_prot);
-	proto_unregister(&udplitev6_prot);
-	proto_unregister(&udpv6_prot);
-	proto_unregister(&tcpv6_prot);
-
-	rcu_barrier(); /* Wait for completion of call_rcu()'s */
-}
-module_exit(inet6_exit);
-
 MODULE_ALIAS_NETPROTO(PF_INET6);
maintainer
#1 lore raw

From: Cong Wang <[email protected]>
Date: Wed, 4 Sep 2013 17:12:50 +0800

Quoted 10 lines

There was some bug report on ipv6 module removal path before. Also, as Stephen pointed out, after vxlan module gets ipv6 support, the ipv6 stub it used is not safe against this module removal either. So, let's just remove inet6_exit() so that ipv6 module will not be able to be unloaded.

Cc Hideaki YOSHIFUJI <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc David S. Miller <[email protected]>

I think we should make an effort to make ipv6 unloadable. If you believe little effort is being put into this now, even less will be expended if I apply a patch like this one.

And this patch has a lot of problems, you aren't removing all of the functions which will be completely unused.

author
#2 lore raw
Quoted 14 lines · David Miller

From: Cong Wang <[email protected]>
Date: Wed, 4 Sep 2013 17:12:50 +0800

Quoted 10 lines

There was some bug report on ipv6 module removal path before. Also, as Stephen pointed out, after vxlan module gets ipv6 support, the ipv6 stub it used is not safe against this module removal either. So, let's just remove inet6_exit() so that ipv6 module will not be able to be unloaded.

Cc Hideaki YOSHIFUJI <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc David S. Miller <[email protected]>
Quoted 6 lines

I think we should make an effort to make ipv6 unloadable. If you believe little effort is being put into this now, even less will be expended if I apply a patch like this one.

And this patch has a lot of problems, you aren't removing all of the functions which will be completely unused.

They are still used in the cleanup path of inet6_init() as well, can't be removed completely.

Thanks!

maintainer
#3 lore raw

From: Cong Wang <[email protected]>
Date: Fri, 06 Sep 2013 10:52:51 +0800

Quoted 6 lines · David Miller
Quoted 2 lines

And this patch has a lot of problems, you aren't removing all of the functions which will be completely unused.

They are still used in the cleanup path of inet6_init() as well, can't be removed completely.

Good point.