Skip to content

Commit

Permalink
ipv6: do not allow ipv6 module to be removed
Browse files Browse the repository at this point in the history
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]>
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Cong Wang authored and davem330 committed Sep 24, 2013
1 parent b0983d3 commit 8ce4406
Showing 1 changed file with 0 additions and 48 deletions.
48 changes: 0 additions & 48 deletions net/ipv6/af_inet6.c
Original file line number Diff line number Diff line change
Expand Up @@ -1028,52 +1028,4 @@ static int __init inet6_init(void)
}
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();
ndisc_late_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);

0 comments on commit 8ce4406

Please sign in to comment.