[src/trunk]: src/sys/dev/usb usbnet: Assert ioctl locking.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66d4a25b09e8
branches:  trunk
changeset: 362510:66d4a25b09e8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Mar 03 05:50:12 2022 +0000

description:
usbnet: Assert ioctl locking.

diffstat:

 sys/dev/usb/usbnet.c |  28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 3e387648b3a0 -r 66d4a25b09e8 sys/dev/usb/usbnet.c
--- a/sys/dev/usb/usbnet.c      Thu Mar 03 05:50:05 2022 +0000
+++ b/sys/dev/usb/usbnet.c      Thu Mar 03 05:50:12 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbnet.c,v 1.69 2022/03/03 05:50:05 riastradh Exp $    */
+/*     $NetBSD: usbnet.c,v 1.70 2022/03/03 05:50:12 riastradh Exp $    */
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.69 2022/03/03 05:50:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.70 2022/03/03 05:50:12 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -161,11 +161,15 @@
 static int
 uno_ioctl(struct usbnet *un, struct ifnet *ifp, u_long cmd, void *data)
 {
-       /*
-        * There are cases where IFNET_LOCK will not be held when we
-        * are called (e.g. add/delete multicast address), so we can't
-        * assert it.
-        */
+
+       switch (cmd) {
+       case SIOCADDMULTI:
+       case SIOCDELMULTI:
+               break;
+       default:
+               KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
+       }
+
        if (un->un_ops->uno_ioctl)
                return (*un->un_ops->uno_ioctl)(ifp, cmd, data);
        return 0;
@@ -174,7 +178,15 @@
 static int
 uno_override_ioctl(struct usbnet *un, struct ifnet *ifp, u_long cmd, void *data)
 {
-       /* See above. */
+
+       switch (cmd) {
+       case SIOCADDMULTI:
+       case SIOCDELMULTI:
+               break;
+       default:
+               KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
+       }
+
        return (*un->un_ops->uno_override_ioctl)(ifp, cmd, data);
 }