diff options
| author | David S. Miller <davem@davemloft.net> | 2005-11-11 15:05:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-11 15:05:47 -0800 |
| commit | 8eb55910521f3449a8125a38dd32fb676703395d (patch) | |
| tree | 46ccf4bf582b5d7d1d240736608e33100ec02607 /net/ipv6/af_inet6.c | |
| parent | 85837ebdd7bb3e96a60e9b4c6af6c60d1273bc67 (diff) | |
| download | lwn-8eb55910521f3449a8125a38dd32fb676703395d.tar.gz lwn-8eb55910521f3449a8125a38dd32fb676703395d.zip | |
[IPV6]: Fix inet6_init missing unregister.
Based mostly upon a patch from Olaf Kirch <okir@suse.de>
When initialization fails in inet6_init(), we should
unregister the PF_INET6 socket ops.
Also, check sock_register()'s return value for errors.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 4f8795af2edb..c63b8ce0e1b5 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -699,12 +699,14 @@ static int __init inet6_init(void) /* Register the family here so that the init calls below will * be able to create sockets. (?? is this dangerous ??) */ - (void) sock_register(&inet6_family_ops); + err = sock_register(&inet6_family_ops); + if (err) + goto out_unregister_raw_proto; /* Initialise ipv6 mibs */ err = init_ipv6_mibs(); if (err) - goto out_unregister_raw_proto; + goto out_unregister_sock; /* * ipngwg API draft makes clear that the correct semantics @@ -796,6 +798,8 @@ icmp_fail: ipv6_sysctl_unregister(); #endif cleanup_ipv6_mibs(); +out_unregister_sock: + sock_unregister(PF_INET6); out_unregister_raw_proto: proto_unregister(&rawv6_prot); out_unregister_udp_proto: |