summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2014-09-22 10:07:25 +0200
committerDavid S. Miller <davem@davemloft.net>2014-09-28 16:19:46 -0400
commitd814b847be7b47575a1cc2194760d3461e1c43c8 (patch)
treebd1c67a308488c25dfb2c407d4cf0aa1760ffdbd /net
parent2b0bb01b6edb3e13c7f71e43bf3a173a795b7b66 (diff)
downloadop-kernel-dev-d814b847be7b47575a1cc2194760d3461e1c43c8.zip
op-kernel-dev-d814b847be7b47575a1cc2194760d3461e1c43c8.tar.gz
ip6_vti: Return an error when adding an existing tunnel.
vti6_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_vti.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 7f52fd9..5833a22 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -253,8 +253,12 @@ static struct ip6_tnl *vti6_locate(struct net *net, struct __ip6_tnl_parm *p,
(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;
OpenPOWER on IntegriCloud