| From e4c36076c2a6195ec62c35b03c3fde84d0087dc8 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Mon, 26 May 2014 19:23:44 +0200 |
| Subject: USB: cdc-acm: fix I/O after failed open |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| commit e4c36076c2a6195ec62c35b03c3fde84d0087dc8 upstream. |
| |
| Make sure to kill any already submitted read urbs on read-urb submission |
| failures in open in order to prevent doing I/O for a closed port. |
| |
| Fixes: 088c64f81284 ("USB: cdc-acm: re-write read processing") |
| Signed-off-by: Johan Hovold <jhovold@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/class/cdc-acm.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/usb/class/cdc-acm.c |
| +++ b/drivers/usb/class/cdc-acm.c |
| @@ -542,6 +542,7 @@ static int acm_port_activate(struct tty_ |
| { |
| struct acm *acm = container_of(port, struct acm, port); |
| int retval = -ENODEV; |
| + int i; |
| |
| dev_dbg(&acm->control->dev, "%s\n", __func__); |
| |
| @@ -590,6 +591,8 @@ static int acm_port_activate(struct tty_ |
| return 0; |
| |
| error_submit_read_urbs: |
| + for (i = 0; i < acm->rx_buflimit; i++) |
| + usb_kill_urb(acm->read_urbs[i]); |
| acm->ctrlout = 0; |
| acm_set_control(acm, acm->ctrlout); |
| error_set_control: |
