diff options
author | Bjørn Mork <bjorn@mork.no> | 2012-01-16 06:41:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-24 15:17:29 -0500 |
commit | c428b70c1e115c5649707a602742e34130d19428 (patch) | |
tree | db052452481dc195d66c1e2761112b62f24a2b6a /drivers/usb | |
parent | 1097ccebe630170080c41df0edcf88e0626e9c75 (diff) |
USB: cdc-wdm: updating desc->length must be protected by spin_lock
wdm_in_callback() will also touch this field, so we cannot change it without locking
Cc: stable@vger.kernel.org
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 1c50baff7725..1f6b5c8394b4 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c | |||
@@ -467,7 +467,9 @@ retry: | |||
467 | for (i = 0; i < desc->length - cntr; i++) | 467 | for (i = 0; i < desc->length - cntr; i++) |
468 | desc->ubuf[i] = desc->ubuf[i + cntr]; | 468 | desc->ubuf[i] = desc->ubuf[i + cntr]; |
469 | 469 | ||
470 | spin_lock_irq(&desc->iuspin); | ||
470 | desc->length -= cntr; | 471 | desc->length -= cntr; |
472 | spin_unlock_irq(&desc->iuspin); | ||
471 | /* in case we had outstanding data */ | 473 | /* in case we had outstanding data */ |
472 | if (!desc->length) | 474 | if (!desc->length) |
473 | clear_bit(WDM_READ, &desc->flags); | 475 | clear_bit(WDM_READ, &desc->flags); |