summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Herzog <t-herzog@gmx.de>2018-09-22 22:11:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-09 16:13:42 +0200
commitdae3ddba36f8c337fb59cef07d564da6fc9b7551 (patch)
tree817ca4e62e0e4e9976c96a24dc18d0cbc40917a7
parentcdc-acm: fix race between reset and control messaging (diff)
downloadlinux-dae3ddba36f8c337fb59cef07d564da6fc9b7551.tar.xz
linux-dae3ddba36f8c337fb59cef07d564da6fc9b7551.zip
cdc-acm: do not reset notification buffer index upon urb unlinking
Resetting the write index of the notification buffer on urb unlink (e.g. closing a cdc-acm device from userspace) may lead to wrong interpretation of further received notifications, in case the index is not 0 when urb unlink happens (i.e. when parts of a notification already have been transferred). On the device side there is no "reset" of the notification transimission and thus we would get out of sync with the device. Signed-off-by: Tobias Herzog <t-herzog@gmx.de> Acked-by: Oliver Neukum <oneukum@suse.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/cdc-acm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 1833912f7f5f..e43ea9641416 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -355,7 +355,6 @@ static void acm_ctrl_irq(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
- acm->nb_index = 0;
dev_dbg(&acm->control->dev,
"%s - urb shutting down with status: %d\n",
__func__, status);