This is a note to let you know that I've just added the patch titled
USB: cdc-acm: fix open and suspend race
to the 3.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-cdc-acm-fix-open-and-suspend-race.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 703df3297fb1950b0aa53e656108eb936d3f21d9 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@xxxxxxxxx>
Date: Mon, 26 May 2014 19:23:42 +0200
Subject: USB: cdc-acm: fix open and suspend race
From: Johan Hovold <jhovold@xxxxxxxxx>
commit 703df3297fb1950b0aa53e656108eb936d3f21d9 upstream.
We must not do the usb_autopm_put_interface() before submitting the read
urbs or we might end up doing I/O to a suspended device.
Fixes: 088c64f81284 ("USB: cdc-acm: re-write read processing")
Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/class/cdc-acm.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -528,19 +528,15 @@ static int acm_port_activate(struct tty_
if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) {
dev_err(&acm->control->dev,
"%s - usb_submit_urb(ctrl irq) failed\n", __func__);
- usb_autopm_put_interface(acm->control);
goto error_submit_urb;
}
acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
if (acm_set_control(acm, acm->ctrlout) < 0 &&
(acm->ctrl_caps & USB_CDC_CAP_LINE)) {
- usb_autopm_put_interface(acm->control);
goto error_set_control;
}
- usb_autopm_put_interface(acm->control);
-
/*
* Unthrottle device in case the TTY was closed while throttled.
*/
@@ -552,6 +548,8 @@ static int acm_port_activate(struct tty_
if (acm_submit_read_urbs(acm, GFP_KERNEL))
goto error_submit_read_urbs;
+ usb_autopm_put_interface(acm->control);
+
mutex_unlock(&acm->mutex);
return 0;
@@ -562,6 +560,7 @@ error_submit_read_urbs:
error_set_control:
usb_kill_urb(acm->ctrlurb);
error_submit_urb:
+ usb_autopm_put_interface(acm->control);
error_get_interface:
disconnected:
mutex_unlock(&acm->mutex);
Patches currently in stable-queue which might be from jhovold@xxxxxxxxx are
queue-3.15/usb-cdc-acm-fix-i-o-after-failed-open.patch
queue-3.15/usb-cdc-acm-fix-write-and-resume-race.patch
queue-3.15/usb-cdc-acm-fix-runtime-pm-for-control-messages.patch
queue-3.15/usb-cdc-acm-fix-broken-runtime-suspend.patch
queue-3.15/usb-cdc-acm-fix-open-and-suspend-race.patch
queue-3.15/usb-cdc-acm-fix-potential-urb-leak-and-pm-imbalance-in-write.patch
queue-3.15/usb-cdc-acm-fix-runtime-pm-imbalance-at-shutdown.patch
queue-3.15/usb-cdc-acm-fix-shutdown-and-suspend-race.patch
queue-3.15/usb-cdc-acm-fix-write-and-suspend-race.patch
queue-3.15/usb-cdc-acm-fix-failed-open-not-being-detected.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html