projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18f9119
)
usb: wusb: don't overflow the Keep Alive IE buffer
author
David Vrabel
<david.vrabel@csr.com>
Mon, 22 Mar 2010 14:50:14 +0000
(14:50 +0000)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Thu, 22 Apr 2010 22:18:22 +0000
(15:18 -0700)
The Keep Alive IE only has space for WUIE_ELT_MAX (== 4) device addresses.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/wusbcore/devconnect.c
patch
|
blob
|
history
diff --git
a/drivers/usb/wusbcore/devconnect.c
b/drivers/usb/wusbcore/devconnect.c
index
46e79d3
..
7ec24e4
100644
(file)
--- a/
drivers/usb/wusbcore/devconnect.c
+++ b/
drivers/usb/wusbcore/devconnect.c
@@
-438,7
+438,7
@@
static void __wusbhc_keep_alive(struct wusbhc *wusbhc)
old_keep_alives = ie->hdr.bLength - sizeof(ie->hdr);
keep_alives = 0;
for (cnt = 0;
- keep_alives <
=
WUIE_ELT_MAX && cnt < wusbhc->ports_max;
+ keep_alives < WUIE_ELT_MAX && cnt < wusbhc->ports_max;
cnt++) {
unsigned tt = msecs_to_jiffies(wusbhc->trust_timeout);