diff options
| author | Florian Westphal <fw@strlen.de> | 2020-03-14 08:18:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-15 00:42:35 -0700 |
| commit | 0fda7600c2e174fe27e9cf02e78e345226e441fa (patch) | |
| tree | a474fa3ee448a16cb37a0b3f5e0b04b71e4c97c4 /drivers | |
| parent | 61fad6816fc10fb8793a925d5c1256d1c3db0cd2 (diff) | |
| download | linux-0fda7600c2e174fe27e9cf02e78e345226e441fa.tar.bz2 | |
geneve: move debug check after netdev unregister
The debug check must be done after unregister_netdevice_many() call --
the list_del() for this is done inside .ndo_stop.
Fixes: 2843a25348f8 ("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/geneve.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 75757e9954ba..09f279c0182b 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1845,8 +1845,6 @@ static void geneve_destroy_tunnels(struct net *net, struct list_head *head) if (!net_eq(dev_net(geneve->dev), net)) unregister_netdevice_queue(geneve->dev, head); } - - WARN_ON_ONCE(!list_empty(&gn->sock_list)); } static void __net_exit geneve_exit_batch_net(struct list_head *net_list) @@ -1861,6 +1859,12 @@ static void __net_exit geneve_exit_batch_net(struct list_head *net_list) /* unregister the devices gathered above */ unregister_netdevice_many(&list); rtnl_unlock(); + + list_for_each_entry(net, net_list, exit_list) { + const struct geneve_net *gn = net_generic(net, geneve_net_id); + + WARN_ON_ONCE(!list_empty(&gn->sock_list)); + } } static struct pernet_operations geneve_net_ops = { |