: Fix free_netdev after failed alloc_netdev in ipgre_init

Passing a NULL-ptr to free_netdev is wrong.

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/10/03 20:39:25+02:00 [email protected]
# [IPV4]: Fix free_netdev after failed alloc_netdev in ipgre_init
#
# Signed-off-by: Patrick McHardy <[email protected]>
#

# net/ipv4/ip_gre.c
#   2004/10/03 20:38:45+02:00 [email protected] +6 -5
#   [IPV4]: Fix free_netdev after failed alloc_netdev in ipgre_init
#   
#   Signed-off-by: Patrick McHardy <[email protected]>
# 
diff -Nru a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
--- a/net/ipv4/ip_gre.c	2004-10-03 22:19:31 +02:00
+++ b/net/ipv4/ip_gre.c	2004-10-03 22:19:31 +02:00
@@ -1250,7 +1250,7 @@

static int __init ipgre_init(void)
{
- int err = -EINVAL;
+ int err;

printk(KERN_INFO "GRE over IPv4 tunneling driver\n");

@@ -1263,18 +1263,19 @@
ipgre_tunnel_setup);
if (!ipgre_fb_tunnel_dev) {
err = -ENOMEM;
- goto fail;
+ goto err1;
}

ipgre_fb_tunnel_dev->init = ipgre_fb_tunnel_init;

if ((err = register_netdev(ipgre_fb_tunnel_dev)))
- goto fail;
+ goto err2;
out:
return err;
-fail:
- inet_del_protocol(&ipgre_protocol, IPPROTO_GRE);
+err2:
free_netdev(ipgre_fb_tunnel_dev);
+err1:
+ inet_del_protocol(&ipgre_protocol, IPPROTO_GRE);
goto out;
}