Commit 2b0bb01b authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller

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: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a4ee9a9
...@@ -364,8 +364,12 @@ static struct ip6_tnl *ip6_tnl_locate(struct net *net, ...@@ -364,8 +364,12 @@ static struct ip6_tnl *ip6_tnl_locate(struct net *net,
(t = rtnl_dereference(*tp)) != NULL; (t = rtnl_dereference(*tp)) != NULL;
tp = &t->next) { tp = &t->next) {
if (ipv6_addr_equal(local, &t->parms.laddr) && 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; return t;
}
} }
if (!create) if (!create)
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment