Browse Source

ip6_gre: Return an error when adding an existing tunnel.

ip6gre_tunnel_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 years ago
parent
commit
cd0a0bd9b8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      net/ipv6/ip6_gre.c

+ 2 - 0
net/ipv6/ip6_gre.c

@@ -314,6 +314,8 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net,
 	struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);
 	struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);
 
 
 	t = ip6gre_tunnel_find(net, parms, ARPHRD_IP6GRE);
 	t = ip6gre_tunnel_find(net, parms, ARPHRD_IP6GRE);
+	if (t && create)
+		return NULL;
 	if (t || !create)
 	if (t || !create)
 		return t;
 		return t;