[PATCH] Bug in ipip.c SIOCDELTUNNEL

[PATCH] Bug in ipip.c SIOCDELTUNNEL

[Taral]

[-- Attachment #1.1: Type: text/plain, Size: 311 bytes --]

Patch is attached. Basically we were always removing "tunl0" even if a
different tunnel was specified.

-- 
Taral <taral@taral.net>
This message is digitally signed. Please PGP encrypt mail to me.
"Any technology, no matter how primitive, is magic to those who don't
understand it." -- Florence Ambrose

[-- Attachment #1.2: ipip.c.patch --]
[-- Type: text/plain, Size: 271 bytes --]

--- /usr/src/linux-2.4.10-pre14/net/ipv4/ipip.c	Sat Sep 22 01:18:30 2001
+++ net/ipv4/ipip.c	Sat Sep 22 02:39:07 2001
@@ -758,6 +758,7 @@
 			err = -EPERM;
 			if (t == &ipip_fb_tunnel)
 				goto done;
+			dev = t->dev;
 		}
 		err = unregister_netdevice(dev);
 		break;

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] Bug in ipip.c SIOCDELTUNNEL

[David S. Miller]

   From: Taral <taral@taral.net>
   Date: Sat, 22 Sep 2001 02:42:41 -0500

   Patch is attached. Basically we were always removing "tunl0" even if a
   different tunnel was specified.
   
A bug in one tunnel driver is likely to be in all the
others :-)  I've taken care of that and the patch I am
using is below:

--- net/ipv4/ipip.c.~1~	Mon Sep 17 17:36:07 2001
+++ net/ipv4/ipip.c	Mon Sep 24 22:09:53 2001
@@ -1,7 +1,7 @@
 /*
  *	Linux NET3:	IP/IP protocol decoder. 
  *
- *	Version: $Id: ipip.c,v 1.47 2001/09/18 00:36:07 davem Exp $
+ *	Version: $Id: ipip.c,v 1.48 2001/09/25 05:09:53 davem Exp $
  *
  *	Authors:
  *		Sam Lantinga (slouken@cs.ucdavis.edu)  02/01/95
@@ -758,6 +758,7 @@
 			err = -EPERM;
 			if (t == &ipip_fb_tunnel)
 				goto done;
+			dev = t->dev;
 		}
 		err = unregister_netdevice(dev);
 		break;
--- net/ipv4/ip_gre.c.~1~	Wed May 16 22:27:58 2001
+++ net/ipv4/ip_gre.c	Mon Sep 24 22:08:43 2001
@@ -1011,6 +1011,7 @@
 			err = -EPERM;
 			if (t == &ipgre_fb_tunnel)
 				goto done;
+			dev = t->dev;
 		}
 		err = unregister_netdevice(dev);
 		break;
--- net/ipv6/sit.c.~1~	Fri Aug 31 17:31:50 2001
+++ net/ipv6/sit.c	Mon Sep 24 22:09:53 2001
@@ -6,7 +6,7 @@
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *	Alexey Kuznetsov	<kuznet@ms2.inr.ac.ru>
  *
- *	$Id: sit.c,v 1.52 2001/09/01 00:31:50 davem Exp $
+ *	$Id: sit.c,v 1.53 2001/09/25 05:09:53 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -712,6 +712,7 @@
 			err = -EPERM;
 			if (t == &ipip6_fb_tunnel)
 				goto done;
+			dev = t->dev;
 		}
 		err = unregister_netdevice(dev);
 		break;