From: David Vrabel <david.vrabel@csr.com>
Date: Mon, 22 Mar 2010 14:50:14 +0000 (+0000)
Subject: usb: wusb: don't overflow the Keep Alive IE buffer
X-Git-Tag: MMI-PSA29.97-13-9~24093^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a23b64845f1ed0c090e30a70ca747a379674e006;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 46e79d349498..7ec24e46b34b 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);