diff options
| author | Oliver Neukum <oneukum@suse.com> | 2018-10-04 15:49:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-10 07:48:35 -0800 |
| commit | 6f053e36bda96461245d0d01f374dac4f7cab54c (patch) | |
| tree | ab753acad43f55509a33caa0527110db44eecbab | |
| parent | 32772ef3f5ed990404c7664782ad77c551d19693 (diff) | |
| download | linux-stable-6f053e36bda96461245d0d01f374dac4f7cab54c.tar.gz linux-stable-6f053e36bda96461245d0d01f374dac4f7cab54c.tar.bz2 linux-stable-6f053e36bda96461245d0d01f374dac4f7cab54c.zip | |
cdc-acm: fix race between reset and control messaging
commit 9397940ed812b942c520e0c25ed4b2c64d57e8b9 upstream.
If a device splits up a control message and a reset() happens
between the parts, the message is lost and already recieved parts
must be dropped.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Fixes: 1aba579f3cf51 ("cdc-acm: handle read pipe errors")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 5a703c33de1c..e41d00bc7e97 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1654,6 +1654,7 @@ static int acm_pre_reset(struct usb_interface *intf) struct acm *acm = usb_get_intfdata(intf); clear_bit(EVENT_RX_STALL, &acm->flags); + acm->nb_index = 0; /* pending control transfers are lost */ return 0; } |