Commit e6b7fdc0 authored by Johan Hovold's avatar Johan Hovold Committed by Jiri Slaby

USB: cdc-acm: fix failed open not being detected

commit 8727bf68 upstream.

Fix errors during open not being returned to userspace. Specifically,
failed control-line manipulations or control or read urb submissions
would not be detected.

Fixes: 7fb57a01 ("USB: cdc-acm: Fix potential deadlock (lockdep
warning)")
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent 0bb6506d
...@@ -514,17 +514,17 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) ...@@ -514,17 +514,17 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
acm->control->needs_remote_wakeup = 1; acm->control->needs_remote_wakeup = 1;
acm->ctrlurb->dev = acm->dev; acm->ctrlurb->dev = acm->dev;
if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) { retval = usb_submit_urb(acm->ctrlurb, GFP_KERNEL);
if (retval) {
dev_err(&acm->control->dev, dev_err(&acm->control->dev,
"%s - usb_submit_urb(ctrl irq) failed\n", __func__); "%s - usb_submit_urb(ctrl irq) failed\n", __func__);
goto error_submit_urb; goto error_submit_urb;
} }
acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS; acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
if (acm_set_control(acm, acm->ctrlout) < 0 && retval = acm_set_control(acm, acm->ctrlout);
(acm->ctrl_caps & USB_CDC_CAP_LINE)) { if (retval < 0 && (acm->ctrl_caps & USB_CDC_CAP_LINE))
goto error_set_control; goto error_set_control;
}
/* /*
* Unthrottle device in case the TTY was closed while throttled. * Unthrottle device in case the TTY was closed while throttled.
...@@ -534,7 +534,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) ...@@ -534,7 +534,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
acm->throttle_req = 0; acm->throttle_req = 0;
spin_unlock_irq(&acm->read_lock); spin_unlock_irq(&acm->read_lock);
if (acm_submit_read_urbs(acm, GFP_KERNEL)) retval = acm_submit_read_urbs(acm, GFP_KERNEL);
if (retval)
goto error_submit_read_urbs; goto error_submit_read_urbs;
usb_autopm_put_interface(acm->control); usb_autopm_put_interface(acm->control);
...@@ -555,7 +556,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) ...@@ -555,7 +556,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
error_get_interface: error_get_interface:
disconnected: disconnected:
mutex_unlock(&acm->mutex); mutex_unlock(&acm->mutex);
return retval;
return usb_translate_errors(retval);
} }
static void acm_port_destruct(struct tty_port *port) static void acm_port_destruct(struct tty_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment