diff options
| author | Roel Kluin | 2009-08-07 01:09:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-23 15:46:32 +0200 |
| commit | 417b57b3e4e34df07a2aceaf75baffeacdd9385f (patch) | |
| tree | 0e0454a8f1cf0a40633dd42a94da9935573bf292 /drivers/usb/gadget/composite.c | |
| parent | USB: usb-storage fails to attach to Huawei Datacard cdrom device (diff) | |
| download | kernel-qcow2-linux-417b57b3e4e34df07a2aceaf75baffeacdd9385f.tar.gz kernel-qcow2-linux-417b57b3e4e34df07a2aceaf75baffeacdd9385f.tar.xz kernel-qcow2-linux-417b57b3e4e34df07a2aceaf75baffeacdd9385f.zip | |
USB: gadget: Read buffer overflow
Check whether index is within bounds before testing the element.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/composite.c')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 59e85234fa0a..d05397ec8a18 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -602,7 +602,7 @@ static int get_string(struct usb_composite_dev *cdev, } } - for (len = 0; s->wData[len] && len <= 126; len++) + for (len = 0; len <= 126 && s->wData[len]; len++) continue; if (!len) return -EINVAL; |