summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2014-09-22 10:07:24 +0200
committerDavid S. Miller <davem@davemloft.net>2014-09-28 16:19:46 -0400
commit2b0bb01b6edb3e13c7f71e43bf3a173a795b7b66 (patch)
tree7b5aa53470eadec8abbd7ddb586ba14bc4af86e4 /net
parent5a4ee9a9a066b1600509d968e1e9eab37c8501d8 (diff)
downloadlinux-stable-2b0bb01b6edb3e13c7f71e43bf3a173a795b7b66.tar.gz
linux-stable-2b0bb01b6edb3e13c7f71e43bf3a173a795b7b66.tar.bz2
linux-stable-2b0bb01b6edb3e13c7f71e43bf3a173a795b7b66.zip
ip6_tunnel: Return an error when adding an existing tunnel.
ip6_tnl_locate() should not return an existing tunnel if create is true. Otherwise it is possible to add the same tunnel multiple times without getting an error. So return NULL if the tunnel that should be created already exists. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_tunnel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index f9de5a695072..69a84b464009 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -364,8 +364,12 @@ static struct ip6_tnl *ip6_tnl_locate(struct net *net,
(t = rtnl_dereference(*tp)) != NULL;
tp = &t->next) {
if (ipv6_addr_equal(local, &t->parms.laddr) &&
- ipv6_addr_equal(remote, &t->parms.raddr))
+ ipv6_addr_equal(remote, &t->parms.raddr)) {
+ if (create)
+ return NULL;
+
return t;
+ }
}
if (!create)
return NULL;