浏览代码

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>
Steffen Klassert 11 年之前
父节点
当前提交
2b0bb01b6e
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      net/ipv6/ip6_tunnel.c

+ 5 - 1
net/ipv6/ip6_tunnel.c

@@ -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;