diff options
| author | Sascha Hlusiak <contact@saschahlusiak.de> | 2009-05-19 12:56:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 16:02:00 -0700 |
| commit | 8db99e5717507729a9eb49108facb7e528340376 (patch) | |
| tree | ba0ed4ecdb3386540bdcbb4bc6af14e1ad9166f5 /net/ipv6 | |
| parent | 9643f4551255ce8b3ef7470aaaf7f435a20f9182 (diff) | |
| download | linux-8db99e5717507729a9eb49108facb7e528340376.tar.gz linux-8db99e5717507729a9eb49108facb7e528340376.tar.bz2 linux-8db99e5717507729a9eb49108facb7e528340376.zip | |
sit: Fail to create tunnel, if it already exists
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/sit.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 664ab82e03b2..e62504133c77 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; |