]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
geneve: Suppress list corruption splat in geneve_destroy_tunnels().
authorKuniyuki Iwashima <kuniyu@amazon.com>
Mon, 17 Feb 2025 20:37:05 +0000 (12:37 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 20 Feb 2025 02:49:29 +0000 (18:49 -0800)
As explained in the previous patch, iterating for_each_netdev() and
gn->geneve_list during ->exit_batch_rtnl() could trigger ->dellink()
twice for the same device.

If CONFIG_DEBUG_LIST is enabled, we will see a list_del() corruption
splat in the 2nd call of geneve_dellink().

Let's remove for_each_netdev() in geneve_destroy_tunnels() and delegate
that part to default_device_exit_batch().

Fixes: 9593172d93b9 ("geneve: Fix use-after-free in geneve_find_dev().")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250217203705.40342-3-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/geneve.c

index a1f674539965db4de6179339cc01892a7c695c34..dbb3960126ee7c32719fd9c475ff4cb86e3a7a33 100644 (file)
@@ -1902,14 +1902,7 @@ static void geneve_destroy_tunnels(struct net *net, struct list_head *head)
 {
        struct geneve_net *gn = net_generic(net, geneve_net_id);
        struct geneve_dev *geneve, *next;
-       struct net_device *dev, *aux;
 
-       /* gather any geneve devices that were moved into this ns */
-       for_each_netdev_safe(net, dev, aux)
-               if (dev->rtnl_link_ops == &geneve_link_ops)
-                       geneve_dellink(dev, head);
-
-       /* now gather any other geneve devices that were created in this ns */
        list_for_each_entry_safe(geneve, next, &gn->geneve_list, next)
                geneve_dellink(geneve->dev, head);
 }