summaryrefslogtreecommitdiff
path: root/net/packet
diff options
context:
space:
mode:
authorAnoob Soman <anoob.soman@citrix.com>2016-10-05 15:12:54 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-15 07:46:37 +0100
commitd72cb5fb36bdc75cc3640b86409c68f1f1cbbe2a (patch)
treed87b31f59d3cf90a4e2762fd61e4fbcf912ba814 /net/packet
parent63091b2c1deae0a7f1347a74097de8ccc9db3359 (diff)
packet: call fanout_release, while UNREGISTERING a netdev
[ Upstream commit 6664498280cf17a59c3e7cf1a931444c02633ed1 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 a86f26d05bc2..ea1115602f58 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3855,6 +3855,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);