Same problem as in ip_gre.c and ipip.c:
Passing a NULL-ptr to free_netdev is wrong.
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/10/03 20:43:32+02:00 kaber@xxxxxxxxxxxx
# [IPV6]: Fix free_netdev after failed alloc_netdev in sit_init
#
# Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
#
# net/ipv6/sit.c
# 2004/10/03 20:43:09+02:00 kaber@xxxxxxxxxxxx +5 -4
# [IPV6]: Fix free_netdev after failed alloc_netdev in sit_init
#
# Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
#
diff -Nru a/net/ipv6/sit.c b/net/ipv6/sit.c
--- a/net/ipv6/sit.c 2004-10-03 22:21:06 +02:00
+++ b/net/ipv6/sit.c 2004-10-03 22:21:06 +02:00
@@ -814,18 +814,19 @@
ipip6_tunnel_setup);
if (!ipip6_fb_tunnel_dev) {
err = -ENOMEM;
- goto fail;
+ goto err1;
}
ipip6_fb_tunnel_dev->init = ipip6_fb_tunnel_init;
if ((err = register_netdev(ipip6_fb_tunnel_dev)))
- goto fail;
+ goto err2;
out:
return err;
- fail:
- inet_del_protocol(&sit_protocol, IPPROTO_IPV6);
+ err2:
free_netdev(ipip6_fb_tunnel_dev);
+ err1:
+ inet_del_protocol(&sit_protocol, IPPROTO_IPV6);
goto out;
}
|