aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2014-05-26 13:23:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-27 18:04:09 -0400
commit183a45087d126d126e8dd1d9b2602fc129dff9ad (patch)
tree39076939fe47eeeaf46f211c484ef843014d8e54 /drivers/usb/class/cdc-acm.c
parented797074031a37bb9bf4a70952fffc606b77274d (diff)
USB: cdc-acm: fix potential urb leak and PM imbalance in write
Make sure to check return value of autopm get in write() in order to avoid urb leak and PM counter imbalance on errors. Fixes: 11ea859d64b6 ("USB: additional power savings for cdc-acm devices that support remote wakeup") Cc: <stable@vger.kernel.org> # v2.6.27 Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r--drivers/usb/class/cdc-acm.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 1ac6c5dda9f7..c255e77282ad 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -668,7 +668,13 @@ static int acm_tty_write(struct tty_struct *tty,
668 memcpy(wb->buf, buf, count); 668 memcpy(wb->buf, buf, count);
669 wb->len = count; 669 wb->len = count;
670 670
671 usb_autopm_get_interface_async(acm->control); 671 stat = usb_autopm_get_interface_async(acm->control);
672 if (stat) {
673 wb->use = 0;
674 spin_unlock_irqrestore(&acm->write_lock, flags);
675 return stat;
676 }
677
672 if (acm->susp_count) { 678 if (acm->susp_count) {
673 usb_anchor_urb(wb->urb, &acm->delayed); 679 usb_anchor_urb(wb->urb, &acm->delayed);
674 spin_unlock_irqrestore(&acm->write_lock, flags); 680 spin_unlock_irqrestore(&acm->write_lock, flags);