From owner-p4-projects@FreeBSD.ORG  Mon Feb 16 20:59:02 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4590E1065673; Mon, 16 Feb 2009 20:59:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0353A106564A
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 20:59:02 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E456D8FC0A
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 20:59:01 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GKx1Vn018314
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 20:59:01 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1GKx1S4018312
	for perforce@freebsd.org; Mon, 16 Feb 2009 20:59:01 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 16 Feb 2009 20:59:01 GMT
Message-Id: <200902162059.n1GKx1S4018312@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 157814 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 20:59:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=157814

Change 157814 by hselasky@hselasky_laptop001 on 2009/02/16 20:58:33

	
	HID patch: The software computed HID size is not always correct,
	because the algoritm does not handle unsorted HID descriptors.
	TODO: Probably libusbhid has the same bug. This needs checking.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#9 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#9 (text+ko) ====

@@ -392,22 +392,38 @@
 {
 	struct hid_data *d;
 	struct hid_item h;
-	int hi, lo, size, id;
+	uint32_t size;
+	uint32_t hi;
+	uint32_t lo;
+	uint8_t id;
 
 	id = 0;
-	hi = lo = -1;
+	hi = 0;
+	lo = (uint32_t)(0-1);
 	for (d = hid_start_parse(buf, len, 1 << k); hid_get_item(d, &h);)
 		if (h.kind == k) {
 			if (h.report_ID != 0 && !id)
 				id = h.report_ID;
 			if (h.report_ID == id) {
-				if (lo < 0)
+				/* check if "lo" is greater than "pos" */
+				if (lo > h.loc.pos)
 					lo = h.loc.pos;
-				hi = h.loc.pos + h.loc.size * h.loc.count;
+				/* compute end position */
+				size = h.loc.pos + (h.loc.size * h.loc.count);
+				/* check if "size" wrapped */
+				/* check if "hi" is less than "size" */
+				if (size < h.loc.pos)
+					hi = (uint32_t)(0-1);
+				else if (hi < size)
+					hi = size;
 			}
 		}
 	hid_end_parse(d);
-	size = hi - lo;
+	if (lo > hi)
+		size = 0;
+	else
+		size = hi - lo;
+
 	if (id != 0) {
 		size += 8;
 		*idp = id;		/* XXX wrong */