summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2010-03-22 14:50:14 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-22 15:18:22 -0700
commita23b64845f1ed0c090e30a70ca747a379674e006 (patch)
tree603bf71c16284622eb6e53cb51cb996fa5ab7b6b
parent18f91196b6e7994bd694a96a6c3b0ac1f3e81d82 (diff)
downloadop-kernel-dev-a23b64845f1ed0c090e30a70ca747a379674e006.zip
op-kernel-dev-a23b64845f1ed0c090e30a70ca747a379674e006.tar.gz
usb: wusb: don't overflow the Keep Alive IE buffer
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>
-rw-r--r--drivers/usb/wusbcore/devconnect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 46e79d3..7ec24e4 100644
--- 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);
OpenPOWER on IntegriCloud