Patchwork [1/5] sit: Fail to create tunnel, if it already exists

login
register
mail settings
Submitter Sascha Hlusiak
Date May 19, 2009, 10:56 p.m.
Message ID <1242773812-9328-1-git-send-email-contact@saschahlusiak.de>
Download mbox | patch
Permalink /patch/27428/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sascha Hlusiak - May 19, 2009, 10:56 p.m.
When locating the tunnel, do not continue if it is found. Otherwise
a different tunnel with similar configuration would be returned and
parts could be overwritten.

Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
---
 net/ipv6/sit.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
David Miller - May 19, 2009, 11:19 p.m.
Ok this series looks a lot better, applied, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 664ab82..e625041 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -165,8 +165,13 @@  static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
 	struct sit_net *sitn = net_generic(net, sit_net_id);
 
 	for (tp = __ipip6_bucket(sitn, parms); (t = *tp) != NULL; tp = &t->next) {
-		if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr)
-			return t;
+		if (local == t->parms.iph.saddr &&
+		    remote == t->parms.iph.daddr) {
+			if (create)
+				return NULL;
+			else
+				return t;
+		}
 	}
 	if (!create)
 		goto failed;