Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2fddf5e authored by Daniel Lezcano's avatar Daniel Lezcano Committed by David S. Miller
Browse files

[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: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 433d49c3

net/ipv6/af_inet6.c

+5 −1
Original line number Diff line number Diff line
@@ -849,7 +849,9 @@ static int __init inet6_init(void) 
	if (if6_proc_init())

		goto proc_if6_fail;

#endif

	ip6_route_init();

	err = ip6_route_init();

	if (err)

		goto ip6_route_fail;

	ip6_flowlabel_init();

	err = addrconf_init();

	if (err)
@@ -874,6 +876,7 @@ static int __init inet6_init(void) 
addrconf_fail:

	ip6_flowlabel_cleanup();

	ip6_route_cleanup();

ip6_route_fail:

#ifdef CONFIG_PROC_FS

	if6_proc_exit();

proc_if6_fail:
@@ -904,6 +907,7 @@ static int __init inet6_init(void) 
	cleanup_ipv6_mibs();

out_unregister_sock:

	sock_unregister(PF_INET6);

	rtnl_unregister_all(PF_INET6);

out_unregister_raw_proto:

	proto_unregister(&rawv6_prot);

out_unregister_udplite_proto: