Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 01:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: cdc-acm: fix I/O after failed open

Browse Source 
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: 088c64f812 ("USB: cdc-acm: re-write read processing")
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2014-05-26 19:23:44 +02:00 committed by Greg Kroah-Hartman
parent 8727bf689a
commit e4c36076c2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/class/cdc-acm.c
View File

@ -506,6 +506,7 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
{ {
struct acm *acm = container_of(port, struct acm, port); struct acm *acm = container_of(port, struct acm, port);
int retval = -ENODEV; int retval = -ENODEV;
int i;
dev_dbg(&acm->control->dev, "%s\n", __func__); dev_dbg(&acm->control->dev, "%s\n", __func__);
@ -556,6 +557,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
return 0; return 0;
error_submit_read_urbs: error_submit_read_urbs:
for (i = 0; i < acm->rx_buflimit; i++)
usb_kill_urb(acm->read_urbs[i]);
acm->ctrlout = 0; acm->ctrlout = 0;
acm_set_control(acm, acm->ctrlout); acm_set_control(acm, acm->ctrlout);
error_set_control: error_set_control: