dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sascha Hlusiak 2009-05-19 12:56:48 +00:00 committed by David S. Miller
parent 9643f45512
commit 8db99e5717
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ipv6/sit.c
View File

@ -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;