summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJeff Westfahl <jeff.westfahl@ni.com>2014-05-29 09:49:41 +0300
committerFelipe Balbi <balbi@ti.com>2014-06-19 10:06:46 -0500
commita9232076374334ca2bc2a448dfde96d38a54349a (patch)
treefc5be5559891d8aaf0b4bfeb8fc395f63456162d /drivers/usb
parent02dae36aa649a66c5c6181157ddd806e7b4913fc (diff)
downloadlinux-a9232076374334ca2bc2a448dfde96d38a54349a.tar.bz2
usb: gadget: u_ether: synchronize with transmit when stopping queue
When disconnecting, it's possible that another thread has already made it into eth_start_xmit before we call netif_stop_queue. This can lead to a crash as eth_start_xmit tries to use resources that gether_disconnect is freeing. Use netif_tx_lock/unlock around netif_stop_queue to ensure no threads are executing during the remainder of gether_disconnect. Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com> Tested-by: Jaeden Amero <jaeden.amero@ni.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/u_ether.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 3d78a8844e43..97b027724ee7 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -1120,7 +1120,10 @@ void gether_disconnect(struct gether *link)
DBG(dev, "%s\n", __func__);
+ netif_tx_lock(dev->net);
netif_stop_queue(dev->net);
+ netif_tx_unlock(dev->net);
+
netif_carrier_off(dev->net);
/* disable endpoints, forcing (synchronous) completion