Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:47:28 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet: Assert IFNET_LOCKED on if_flags change callbacks.
- if_init
- if_stop
- ethersubr(9) ifflags_cb
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 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.49 src/sys/dev/usb/usbnet.c:1.50
--- src/sys/dev/usb/usbnet.c:1.49 Thu Mar 3 05:47:21 2022
+++ src/sys/dev/usb/usbnet.c Thu Mar 3 05:47:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.49 2022/03/03 05:47:21 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.50 2022/03/03 05:47:28 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.49 2022/03/03 05:47:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.50 2022/03/03 05:47:28 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1006,6 +1006,8 @@ usbnet_ifflags_cb(struct ethercom *ec)
struct usbnet_private * const unp = un->un_pri;
int rv = 0;
+ KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
+
mutex_enter(&unp->unp_core_lock);
const u_short changed = ifp->if_flags ^ unp->unp_if_flags;
@@ -1163,6 +1165,8 @@ usbnet_if_stop(struct ifnet *ifp, int di
struct usbnet * const un = ifp->if_softc;
struct usbnet_private * const unp = un->un_pri;
+ KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
+
mutex_enter(&unp->unp_core_lock);
usbnet_stop(un, ifp, disable);
mutex_exit(&unp->unp_core_lock);
@@ -1272,6 +1276,8 @@ usbnet_if_init(struct ifnet *ifp)
USBNETHIST_FUNC(); USBNETHIST_CALLED();
struct usbnet * const un = ifp->if_softc;
+ KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
+
return uno_init(un, ifp);
}
