vti: don't allow to add the same tunnel twice

Before the patch, it was possible to add two times the same tunnel:
ip l a vti1 type vti remote 10.16.0.121 local 10.16.0.249 key 41
ip l a vti2 type vti remote 10.16.0.121 local 10.16.0.249 key 41

It was possible, because ip_tunnel_newlink() calls ip_tunnel_find() with the
argument dev->type, which was set only later (when calling ndo_init handler
in register_netdevice()). Let's set this type in the setup handler, which is
called before newlink handler.

Introduced by commit b9959fd3b0fa ("vti: switch to new ip tunnel code").

CC: Cong Wang <amwang@redhat.com>
CC: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Nicolas Dichtel and committed by David S. Miller 8d89dcdf 5a455275

+1 -1
+1 -1
net/ipv4/ip_vti.c
··· 337 337 static void vti_tunnel_setup(struct net_device *dev) 338 338 { 339 339 dev->netdev_ops = &vti_netdev_ops; 340 + dev->type = ARPHRD_TUNNEL; 340 341 ip_tunnel_setup(dev, vti_net_id); 341 342 } 342 343 ··· 349 348 memcpy(dev->dev_addr, &iph->saddr, 4); 350 349 memcpy(dev->broadcast, &iph->daddr, 4); 351 350 352 - dev->type = ARPHRD_TUNNEL; 353 351 dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); 354 352 dev->mtu = ETH_DATA_LEN; 355 353 dev->flags = IFF_NOARP;