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

Interrupt descriptors might become invalid while being processed in 

uhci_check_intr - so remember their next pointer before calling it.
Patch provided by Matthew Orgass in PR kern/24542.
This commit is contained in:
martin 2004-03-02 16:32:05 +00:00
parent 79a5cbaf41
commit ce925f4f4f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: uhci.c,v 1.177 2003/12/29 08:17:10 toshii Exp $ */ /* $NetBSD: uhci.c,v 1.178 2004/03/02 16:32:05 martin Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/* /*
@ -49,7 +49,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.177 2003/12/29 08:17:10 toshii Exp $"); __KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.178 2004/03/02 16:32:05 martin Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1258,7 +1258,7 @@ void
uhci_softintr(void *v) uhci_softintr(void *v)
{ {
uhci_softc_t *sc = v; uhci_softc_t *sc = v;
uhci_intr_info_t *ii; uhci_intr_info_t *ii, *nextii;
DPRINTFN(10,("%s: uhci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev), DPRINTFN(10,("%s: uhci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev),
sc->sc_bus.intr_context)); sc->sc_bus.intr_context));
@ -1276,8 +1276,10 @@ uhci_softintr(void *v)
* We scan all interrupt descriptors to see if any have * We scan all interrupt descriptors to see if any have
* completed. * completed.
*/ */
for (ii = LIST_FIRST(&sc->sc_intrhead); ii; ii = LIST_NEXT(ii, list)) for (ii = LIST_FIRST(&sc->sc_intrhead); ii; ii = nextii) {
nextii = LIST_NEXT(ii, list);
uhci_check_intr(sc, ii); uhci_check_intr(sc, ii);
}
#ifdef USB_USE_SOFTINTR #ifdef USB_USE_SOFTINTR
if (sc->sc_softwake) { if (sc->sc_softwake) {