Browse Source

[IPV6]: Make af_inet6 to check ip6_route_init return value.

The af_inet6 initialization function does not check the return code of
the route initilization, so if something goes wrong, the protocol
initialization will continue anyway.  This patch takes into account
the modification made in the different route's initialization
subroutines to check the return value and to make the protocol
initialization to fail.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Daniel Lezcano 17 years ago
parent
commit
e2fddf5e96
1 changed files with 5 additions and 1 deletions
  1. 5 1
      net/ipv6/af_inet6.c

+ 5 - 1
net/ipv6/af_inet6.c

@@ -849,7 +849,9 @@ static int __init inet6_init(void)
 	if (if6_proc_init())
 	if (if6_proc_init())
 		goto proc_if6_fail;
 		goto proc_if6_fail;
 #endif
 #endif
-	ip6_route_init();
+	err = ip6_route_init();
+	if (err)
+		goto ip6_route_fail;
 	ip6_flowlabel_init();
 	ip6_flowlabel_init();
 	err = addrconf_init();
 	err = addrconf_init();
 	if (err)
 	if (err)
@@ -874,6 +876,7 @@ out:
 addrconf_fail:
 addrconf_fail:
 	ip6_flowlabel_cleanup();
 	ip6_flowlabel_cleanup();
 	ip6_route_cleanup();
 	ip6_route_cleanup();
+ip6_route_fail:
 #ifdef CONFIG_PROC_FS
 #ifdef CONFIG_PROC_FS
 	if6_proc_exit();
 	if6_proc_exit();
 proc_if6_fail:
 proc_if6_fail:
@@ -904,6 +907,7 @@ icmp_fail:
 	cleanup_ipv6_mibs();
 	cleanup_ipv6_mibs();
 out_unregister_sock:
 out_unregister_sock:
 	sock_unregister(PF_INET6);
 	sock_unregister(PF_INET6);
+	rtnl_unregister_all(PF_INET6);
 out_unregister_raw_proto:
 out_unregister_raw_proto:
 	proto_unregister(&rawv6_prot);
 	proto_unregister(&rawv6_prot);
 out_unregister_udplite_proto:
 out_unregister_udplite_proto: