summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2024-08-06 19:28:05 +0200
committerDavid S. Miller <davem@davemloft.net>2024-08-09 13:54:20 +0100
commite5876b088ba03a62124266fa20d00e65533c7269 (patch)
tree3292e06d955dcae047ba3409e93d75ffd09d61e9 /drivers
parentee9a43b7cfe2d8a3520335fea7d8ce71b8cabd9d (diff)
downloadlinux-stable-e5876b088ba03a62124266fa20d00e65533c7269.tar.gz
linux-stable-e5876b088ba03a62124266fa20d00e65533c7269.tar.bz2
linux-stable-e5876b088ba03a62124266fa20d00e65533c7269.zip
usbnet: ipheth: race between ipheth_close and error handling
ipheth_sndbulk_callback() can submit carrier_work as a part of its error handling. That means that the driver must make sure that the work is cancelled after it has made sure that no more URB can terminate with an error condition. Hence the order of actions in ipheth_close() needs to be inverted. Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Foster Snowhill <forst@pen.gy> Tested-by: Georgi Valkov <gvalkov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/ipheth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 687d70cfc556..6eeef10edada 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -475,8 +475,8 @@ static int ipheth_close(struct net_device *net)
{
struct ipheth_device *dev = netdev_priv(net);
- cancel_delayed_work_sync(&dev->carrier_work);
netif_stop_queue(net);
+ cancel_delayed_work_sync(&dev->carrier_work);
return 0;
}