packet: call fanout_release, while UNREGISTERING a netdev
authorAnoob Soman <anoob.soman@citrix.com>
Wed, 5 Oct 2016 14:12:54 +0000 (15:12 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Oct 2016 00:50:18 +0000 (20:50 -0400)
If a socket has FANOUT sockopt set, a new proto_hook is registered
as part of fanout_add(). When processing a NETDEV_UNREGISTER event in
af_packet, __fanout_unlink is called for all sockets, but prot_hook which was
registered as part of fanout_add is not removed. Call fanout_release, on a
NETDEV_UNREGISTER, which removes prot_hook and removes fanout from the
fanout_list.

This fixes BUG_ON(!list_empty(&dev->ptype_specific)) in netdev_run_todo()

Signed-off-by: Anoob Soman <anoob.soman@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/packet/af_packet.c

index 33a4697d55394c0a73b5f88e3b19ecd0d923a878..11db0d619c007270e7ac003e916a4a4097a79dc9 100644 (file)
@@ -3952,6 +3952,7 @@ static int packet_notifier(struct notifier_block *this,
                                }
                                if (msg == NETDEV_UNREGISTER) {
                                        packet_cached_dev_reset(po);
+                                       fanout_release(sk);
                                        po->ifindex = -1;
                                        if (po->prot_hook.dev)
                                                dev_put(po->prot_hook.dev);