diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2014-04-11 18:10:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-16 16:56:08 -0400 |
commit | 070c0b17f6a1ba39dff9be112218127e7e8fd456 (patch) | |
tree | 234e8b760c190f6a93a8f8de0776aaf2e93f5cd0 | |
parent | f9076e28013e448ba2a905ae905ac9b53f8a2e16 (diff) |
USB: cdc-acm: fix double usb_autopm_put_interface() in acm_port_activate()
If acm_submit_read_urbs() fails in acm_port_activate(), error handling
code calls usb_autopm_put_interface() while it is already called
before acm_submit_read_urbs(). The patch reorganizes error handling code
to avoid double decrement of USB interface's PM-usage counter.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 900f7ff805ee..d5d2c922186a 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -518,13 +518,16 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) | |||
518 | if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) { | 518 | if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) { |
519 | dev_err(&acm->control->dev, | 519 | dev_err(&acm->control->dev, |
520 | "%s - usb_submit_urb(ctrl irq) failed\n", __func__); | 520 | "%s - usb_submit_urb(ctrl irq) failed\n", __func__); |
521 | usb_autopm_put_interface(acm->control); | ||
521 | goto error_submit_urb; | 522 | goto error_submit_urb; |
522 | } | 523 | } |
523 | 524 | ||
524 | acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS; | 525 | acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS; |
525 | if (acm_set_control(acm, acm->ctrlout) < 0 && | 526 | if (acm_set_control(acm, acm->ctrlout) < 0 && |
526 | (acm->ctrl_caps & USB_CDC_CAP_LINE)) | 527 | (acm->ctrl_caps & USB_CDC_CAP_LINE)) { |
528 | usb_autopm_put_interface(acm->control); | ||
527 | goto error_set_control; | 529 | goto error_set_control; |
530 | } | ||
528 | 531 | ||
529 | usb_autopm_put_interface(acm->control); | 532 | usb_autopm_put_interface(acm->control); |
530 | 533 | ||
@@ -549,7 +552,6 @@ error_submit_read_urbs: | |||
549 | error_set_control: | 552 | error_set_control: |
550 | usb_kill_urb(acm->ctrlurb); | 553 | usb_kill_urb(acm->ctrlurb); |
551 | error_submit_urb: | 554 | error_submit_urb: |
552 | usb_autopm_put_interface(acm->control); | ||
553 | error_get_interface: | 555 | error_get_interface: |
554 | disconnected: | 556 | disconnected: |
555 | mutex_unlock(&acm->mutex); | 557 | mutex_unlock(&acm->mutex); |