Skip to content

Commit 54d63f7

Browse files
NicolasDichteldavem330
authored andcommitted
ip6_gre: don't allow to remove the fb_tunnel_dev
It's possible to remove the FB tunnel with the command 'ip link del ip6gre0' but this is unsafe, the module always supposes that this device exists. For example, ip6gre_tunnel_lookup() may use it unconditionally. Let's add a rtnl handler for dellink, which will never remove the FB tunnel (we let ip6gre_destroy_tunnels() do the job). Introduced by commit c12b395 ("gre: Support GRE over IPv6"). CC: Dmitry Kozlov <[email protected]> Signed-off-by: Nicolas Dichtel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent aad8872 commit 54d63f7

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

net/ipv6/ip6_gre.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,15 @@ static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[],
15591559
return 0;
15601560
}
15611561

1562+
static void ip6gre_dellink(struct net_device *dev, struct list_head *head)
1563+
{
1564+
struct net *net = dev_net(dev);
1565+
struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);
1566+
1567+
if (dev != ign->fb_tunnel_dev)
1568+
unregister_netdevice_queue(dev, head);
1569+
}
1570+
15621571
static size_t ip6gre_get_size(const struct net_device *dev)
15631572
{
15641573
return
@@ -1636,6 +1645,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
16361645
.validate = ip6gre_tunnel_validate,
16371646
.newlink = ip6gre_newlink,
16381647
.changelink = ip6gre_changelink,
1648+
.dellink = ip6gre_dellink,
16391649
.get_size = ip6gre_get_size,
16401650
.fill_info = ip6gre_fill_info,
16411651
};

0 commit comments

Comments
 (0)