]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ip6_tunnel: Return an error when adding an existing tunnel.
authorSteffen Klassert <steffen.klassert@secunet.com>
Mon, 22 Sep 2014 08:07:24 +0000 (10:07 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Sep 2014 20:19:46 +0000 (16:19 -0400)
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>
net/ipv6/ip6_tunnel.c

index f9de5a69507252a12cbf1efffbf416721d9c871a..69a84b464009cc3192d42acc8a2c4d1e8419ca61 100644 (file)
@@ -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;