Ver Fonte

ipv6: Fix BUG when disabled ipv6 module is unloaded

Do not try to "uninitialize" ipv6 if its initialization had been skipped
because module parameter disable=1 had been specified.

Reported-by:  Thomas Backlund <tmb@mandriva.org>
Signed-off-by: John Dykstra <john.dykstra1@gmail.com>
Acked-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Dykstra há 16 anos atrás
pai
commit
ff8cf9a938
1 ficheiros alterados com 3 adições e 0 exclusões
  1. 3 0
      net/ipv6/af_inet6.c

+ 3 - 0
net/ipv6/af_inet6.c

@@ -1192,6 +1192,9 @@ module_init(inet6_init);
 
 
 static void __exit inet6_exit(void)
 static void __exit inet6_exit(void)
 {
 {
+	if (disable_ipv6)
+		return;
+
 	/* First of all disallow new sockets creation. */
 	/* First of all disallow new sockets creation. */
 	sock_unregister(PF_INET6);
 	sock_unregister(PF_INET6);
 	/* Disallow any further netlink messages */
 	/* Disallow any further netlink messages */