summaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorAnoob Soman <anoob.soman@citrix.com>2016-10-05 15:12:54 +0100
committerDavid S. Miller <davem@davemloft.net>2016-10-06 20:50:18 -0400
commit6664498280cf17a59c3e7cf1a931444c02633ed1 (patch)
tree6696e1e8b3d5368033b86706d652c93080d12f5a /net/packet
parent3d9e133fe611a4efc9be3ff04a0dcdf705fa6d84 (diff)
downloadlinux-stable-6664498280cf17a59c3e7cf1a931444c02633ed1.tar.gz
linux-stable-6664498280cf17a59c3e7cf1a931444c02633ed1.tar.bz2
linux-stable-6664498280cf17a59c3e7cf1a931444c02633ed1.zip
packet: call fanout_release, while UNREGISTERING a netdev
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>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 33a4697d5539..11db0d619c00 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -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);