ipv6: Fix BUG when disabled ipv6 module is unloaded

jdykstra · davem330 · commit ff8cf9a93800 · 2009-03-11T09:22:51.000-07:00
Do not try to "uninitialize" ipv6 if its initialization had been skipped
because module parameter disable=1 had been specified.

Reported-by:  Thomas Backlund &lt;tmb@mandriva.org&gt;
Signed-off-by: John Dykstra &lt;john.dykstra1@gmail.com&gt;
Acked-by: Brian Haley &lt;brian.haley@hp.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
@@ -1192,6 +1192,9 @@ module_init(inet6_init);
 
 static void __exit inet6_exit(void)
 {
+	if (disable_ipv6)
+		return;
+
 	/* First of all disallow new sockets creation. */
 	sock_unregister(PF_INET6);
 	/* Disallow any further netlink messages */

Original file line number	Diff line number	Diff line change
`@@ -1192,6 +1192,9 @@ module_init(inet6_init);`
`1192`	`1192`
`1193`	`1193`	`static void __exit inet6_exit(void)`
`1194`	`1194`	`{`
	`1195`	`+ if (disable_ipv6)`
	`1196`	`+ return;`
	`1197`	`+`
`1195`	`1198`	`/* First of all disallow new sockets creation. */`
`1196`	`1199`	`sock_unregister(PF_INET6);`
`1197`	`1200`	`/* Disallow any further netlink messages */`