diff options
| author | Bjørn Mork <bjorn@mork.no> | 2012-01-16 12:41:47 +0100 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-09 15:52:53 -0800 |
| commit | 09a3c538464a83ec9b82e3af2e9ab991ed61b319 (patch) | |
| tree | 66bc02e9f52576e70a5f7f670f3cf17e9ab939d2 /drivers/usb | |
| parent | 7cd9f9ea48552a43adec5a98c1a96c65a88927f1 (diff) | |
USB: cdc-wdm: updating desc->length must be protected by spin_lock
commit c428b70c1e115c5649707a602742e34130d19428 upstream.
wdm_in_callback() will also touch this field, so we cannot change it without locking
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Change-Id: I7eb2367de1a74be1ac68578354113154595d02cc
Reviewed-on: http://git-master/r/79671
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/class/cdc-wdm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 8516a8c10e1e..f5eb38d03e69 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -469,7 +469,9 @@ retry: for (i = 0; i < desc->length - cntr; i++) desc->ubuf[i] = desc->ubuf[i + cntr]; + spin_lock_irq(&desc->iuspin); desc->length -= cntr; + spin_unlock_irq(&desc->iuspin); /* in case we had outstanding data */ if (!desc->length) clear_bit(WDM_READ, &desc->flags); |