Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:47:06 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet: Take IFNET_LOCK around access to if_flags in usbnet_detach.
This is not stable without IFNET_LOCK. Extraneous calls to
usbnet_stop arising from this race might be harmless, but let's
render it unnecessary to even think about that.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/usbnet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.46 src/sys/dev/usb/usbnet.c:1.47
--- src/sys/dev/usb/usbnet.c:1.46 Thu Mar 3 05:46:58 2022
+++ src/sys/dev/usb/usbnet.c Thu Mar 3 05:47:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.46 2022/03/03 05:46:58 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.47 2022/03/03 05:47:06 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.46 2022/03/03 05:46:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.47 2022/03/03 05:47:06 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1554,11 +1554,11 @@ usbnet_detach(device_t self, int flags)
unp->unp_dying = true;
mutex_exit(&unp->unp_core_lock);
+ IFNET_LOCK(ifp);
if (ifp->if_flags & IFF_RUNNING) {
- IFNET_LOCK(ifp);
usbnet_if_stop(ifp, 1);
- IFNET_UNLOCK(ifp);
}
+ IFNET_UNLOCK(ifp);
callout_halt(&unp->unp_stat_ch, NULL);
usb_rem_task_wait(un->un_udev, &unp->unp_ticktask, USB_TASKQ_DRIVER,
