Skip to content

Commit 2c1a05e

Browse files
Florian Westphalgregkh
authored andcommitted
geneve: move debug check after netdev unregister
[ Upstream commit 0fda760 ] The debug check must be done after unregister_netdevice_many() call -- the list_del() for this is done inside .ndo_stop. Fixes: 2843a25 ("geneve: speedup geneve tunnels dismantle") Reported-and-tested-by: <syzbot+68a8ed58e3d17c700de5@syzkaller.appspotmail.com> Cc: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 013b146 commit 2c1a05e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/net/geneve.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,8 +1725,6 @@ static void geneve_destroy_tunnels(struct net *net, struct list_head *head)
17251725
if (!net_eq(dev_net(geneve->dev), net))
17261726
unregister_netdevice_queue(geneve->dev, head);
17271727
}
1728-
1729-
WARN_ON_ONCE(!list_empty(&gn->sock_list));
17301728
}
17311729

17321730
static void __net_exit geneve_exit_batch_net(struct list_head *net_list)
@@ -1741,6 +1739,12 @@ static void __net_exit geneve_exit_batch_net(struct list_head *net_list)
17411739
/* unregister the devices gathered above */
17421740
unregister_netdevice_many(&list);
17431741
rtnl_unlock();
1742+
1743+
list_for_each_entry(net, net_list, exit_list) {
1744+
const struct geneve_net *gn = net_generic(net, geneve_net_id);
1745+
1746+
WARN_ON_ONCE(!list_empty(&gn->sock_list));
1747+
}
17441748
}
17451749

17461750
static struct pernet_operations geneve_net_ops = {

0 commit comments

Comments
 (0)