Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:47:21 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet: Ensure access to unp_timer is protected by unp_txlock.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 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.48 src/sys/dev/usb/usbnet.c:1.49
--- src/sys/dev/usb/usbnet.c:1.48 Thu Mar 3 05:47:14 2022
+++ src/sys/dev/usb/usbnet.c Thu Mar 3 05:47:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.48 2022/03/03 05:47:14 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.49 2022/03/03 05:47:21 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.48 2022/03/03 05:47:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.49 2022/03/03 05:47:21 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1127,7 +1127,9 @@ usbnet_stop(struct usbnet *un, struct if
uno_stop(un, ifp, disable);
+ mutex_enter(&unp->unp_txlock);
unp->unp_timer = 0;
+ mutex_exit(&unp->unp_txlock);
callout_halt(&unp->unp_stat_ch, &unp->unp_core_lock);
usb_rem_task_wait(un->un_udev, &unp->unp_ticktask, USB_TASKQ_DRIVER,
@@ -1239,7 +1241,10 @@ usbnet_tick_task(void *arg)
usbnet_busy(un);
mutex_exit(&unp->unp_core_lock);
- if (unp->unp_timer != 0 && --unp->unp_timer == 0)
+ mutex_enter(&unp->unp_txlock);
+ const bool timeout = unp->unp_timer != 0 && --unp->unp_timer == 0;
+ mutex_exit(&unp->unp_txlock);
+ if (timeout)
usbnet_watchdog(ifp);
DPRINTFN(8, "mii %#jx ifp %#jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
