Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usbnet(9): Don't touch unp_stopping in usbnet_pipe_intr. 

This access was unprotected by a lock, but it's not necessary anyway:
usbnet_stop aborts the pipes, and the xfer doesn't call usbd_transfer
to reschedule itself -- it's an intr pipe, so it's rescheduled
internally by usbdi(9) in a way that usbd_abort_pipe atomically
prevents.
This commit is contained in:
riastradh 2022-08-20 14:06:09 +00:00
parent 719db767f7
commit bc98c50994
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/usb/usbnet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usbnet.c,v 1.100 2022/08/20 14:05:58 riastradh Exp $ */ /* $NetBSD: usbnet.c,v 1.101 2022/08/20 14:06:09 riastradh Exp $ */
/* /*
* Copyright (c) 2019 Matthew R. Green * Copyright (c) 2019 Matthew R. Green
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.100 2022/08/20 14:05:58 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.101 2022/08/20 14:06:09 riastradh Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -460,12 +460,12 @@ usbnet_pipe_intr(struct usbd_xfer *xfer, void *priv, usbd_status status)
struct usbnet_private * const unp = un->un_pri; struct usbnet_private * const unp = un->un_pri;
struct usbnet_intr * const uni __unused = un->un_intr; struct usbnet_intr * const uni __unused = un->un_intr;
if (usbnet_isdying(un) || unp->unp_stopping || if (usbnet_isdying(un) ||
status == USBD_INVAL || status == USBD_NOT_STARTED || status == USBD_INVAL || status == USBD_NOT_STARTED ||
status == USBD_CANCELLED) { status == USBD_CANCELLED) {
USBNETHIST_CALLARGS("%jd: uni %#jx d/s %#jx status %#jx", USBNETHIST_CALLARGS("%jd: uni %#jx dying %#jx status %#jx",
unp->unp_number, (uintptr_t)uni, unp->unp_number, (uintptr_t)uni,
(usbnet_isdying(un) << 8) | unp->unp_stopping, status); usbnet_isdying(un), status);
return; return;
} }