lkml.org 
[lkml]   [2014]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 073/140] vti: dont allow to add the same tunnel twice
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nicolas Dichtel <nicolas.dichtel@6wind.com>

    [ Upstream commit 8d89dcdf80d88007647945a753821a06eb6cc5a5 ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/ip_vti.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/ipv4/ip_vti.c
    +++ b/net/ipv4/ip_vti.c
    @@ -207,6 +207,7 @@ static const struct net_device_ops vti_n
    static void vti_tunnel_setup(struct net_device *dev)
    {
    dev->netdev_ops = &vti_netdev_ops;
    + dev->type = ARPHRD_TUNNEL;
    ip_tunnel_setup(dev, vti_net_id);
    }

    @@ -218,7 +219,6 @@ static int vti_tunnel_init(struct net_de
    memcpy(dev->dev_addr, &iph->saddr, 4);
    memcpy(dev->broadcast, &iph->daddr, 4);

    - dev->type = ARPHRD_TUNNEL;
    dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr);
    dev->mtu = ETH_DATA_LEN;
    dev->flags = IFF_NOARP;



    \
     
     \ /
      Last update: 2014-05-29 08:01    [W:4.114 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site