diff options
| author |   Steffen Klassert <steffen.klassert@secunet.com> | 2014-09-22 10:07:25 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-28 16:19:46 -0400 |
| commit | d814b847be7b47575a1cc2194760d3461e1c43c8 (patch) | |
| tree | bd1c67a308488c25dfb2c407d4cf0aa1760ffdbd /net | |
| parent | ip6_tunnel: Return an error when adding an existing tunnel. (diff) | |
| download | linux-dev-d814b847be7b47575a1cc2194760d3461e1c43c8.tar.xz linux-dev-d814b847be7b47575a1cc2194760d3461e1c43c8.zip | |
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.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 7f52fd9fa7b0..5833a2244467 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; |