Skip to content

Commit 0ee1f47

Browse files
Jiri Slabydavem330
authored andcommitted
r8152: napi hangup fix after disconnect
When unplugging an r8152 adapter while the interface is UP, the NIC becomes unusable. usb->disconnect (aka rtl8152_disconnect) deletes napi. Then, rtl8152_disconnect calls unregister_netdev and that invokes netdev->ndo_stop (aka rtl8152_close). rtl8152_close tries to napi_disable, but the napi is already deleted by disconnect above. So the first while loop in napi_disable never finishes. This results in complete deadlock of the network layer as there is rtnl_mutex held by unregister_netdev. So avoid the call to napi_disable in rtl8152_close when the device is already gone. The other calls to usb_kill_urb, cancel_delayed_work_sync, netif_stop_queue etc. seem to be fine. The urb and netdev is not destroyed yet. Signed-off-by: Jiri Slaby <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: David S. Miller <[email protected]>
1 parent 6f0d349 commit 0ee1f47

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/usb/r8152.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3962,7 +3962,8 @@ static int rtl8152_close(struct net_device *netdev)
39623962
#ifdef CONFIG_PM_SLEEP
39633963
unregister_pm_notifier(&tp->pm_notifier);
39643964
#endif
3965-
napi_disable(&tp->napi);
3965+
if (!test_bit(RTL8152_UNPLUG, &tp->flags))
3966+
napi_disable(&tp->napi);
39663967
clear_bit(WORK_ENABLE, &tp->flags);
39673968
usb_kill_urb(tp->intr_urb);
39683969
cancel_delayed_work_sync(&tp->schedule);

0 commit comments

Comments
 (0)