[net-stable,13/24] hv_netvsc: cancel subchannel setup before halting device

Message ID 20180514223223.25433-14-sthemmin@microsoft.com
State Not Applicable
Delegated to: David Miller
Headers show
  • hv_netvsc patches for 4.14 stable
Related show

Commit Message

Stephen Hemminger May 14, 2018, 10:32 p.m.
From: Stephen Hemminger <stephen@networkplumber.org>

commit a7483ec0267c69b34e818738da60b392623da94b upstream

Block setup of multiple channels earlier in the teardown
process. This avoids possible races between halt and subchannel

Suggested-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 drivers/net/hyperv/rndis_filter.c | 3 +++
 1 file changed, 3 insertions(+)


diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 05109ed5377c..5a312b2d5a7b 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1340,6 +1340,9 @@  void rndis_filter_device_remove(struct hv_device *dev,
 	struct rndis_device *rndis_dev = net_dev->extension;
+	/* Don't try and setup sub channels if about to halt */
+	cancel_work_sync(&net_dev->subchan_work);
 	/* Halt and release the rndis device */