diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2013-02-08 22:51:09 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2013-02-08 22:51:09 +0000 |
| commit | 056e0b5dcdc09315d97fa11a6cf9115f19694317 (patch) | |
| tree | c17a7e6d3ff8e2b17992b888fa536381674f503a /sys/dev | |
| parent | 08c49d655e52c45d2b0da8818d06656a68ecbdfe (diff) | |
| download | src-056e0b5dcdc09315d97fa11a6cf9115f19694317.tar.gz src-056e0b5dcdc09315d97fa11a6cf9115f19694317.zip | |
Make sure we don't leak command buffers when a USB
command transfer fails.
MFC after: 1 week
Reported by: Ian FREISLICH
Notes
Notes:
svn path=/head/; revision=246570
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/wlan/if_uath.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 37162c089313..938e52ebb762 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -2436,11 +2436,8 @@ uath_intr_tx_callback(struct usb_xfer *xfer, usb_error_t error) UATH_ASSERT_LOCKED(sc); - switch (USB_GET_STATE(xfer)) { - case USB_ST_TRANSFERRED: - cmd = STAILQ_FIRST(&sc->sc_cmd_active); - if (cmd == NULL) - goto setup; + cmd = STAILQ_FIRST(&sc->sc_cmd_active); + if (cmd != NULL && USB_GET_STATE(xfer) != USB_ST_SETUP) { STAILQ_REMOVE_HEAD(&sc->sc_cmd_active, next); UATH_STAT_DEC(sc, st_cmd_active); STAILQ_INSERT_TAIL((cmd->flags & UATH_CMD_FLAG_READ) ? @@ -2449,7 +2446,10 @@ uath_intr_tx_callback(struct usb_xfer *xfer, usb_error_t error) UATH_STAT_INC(sc, st_cmd_waiting); else UATH_STAT_INC(sc, st_cmd_inactive); - /* FALLTHROUGH */ + } + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: case USB_ST_SETUP: setup: cmd = STAILQ_FIRST(&sc->sc_cmd_pending); |