From owner-p4-projects@FreeBSD.ORG  Tue Mar 18 20:35:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91ABD106566C; Tue, 18 Mar 2008 20:35:47 +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 5062F1065676
	for <perforce@FreeBSD.org>; Tue, 18 Mar 2008 20:35:47 +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 51F488FC2B
	for <perforce@FreeBSD.org>; Tue, 18 Mar 2008 20:35:47 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2IKZlos043734
	for <perforce@FreeBSD.org>; Tue, 18 Mar 2008 20:35:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2IKZl5p043732
	for perforce@freebsd.org; Tue, 18 Mar 2008 20:35:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 18 Mar 2008 20:35:47 GMT
Message-Id: <200803182035.m2IKZl5p043732@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 138046 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: Tue, 18 Mar 2008 20:35:48 -0000

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

Change 138046 by hselasky@hselasky_laptop001 on 2008/03/18 20:35:12

	
	Put an upper limit on the allowed "usbd_do_request" timeout, in case
	this value is derived from user input.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#121 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#121 (text+ko) ====

@@ -3867,7 +3867,10 @@
  * used.
  *
  * "timeout" - gives the timeout for the control transfer in
- * milliseconds.
+ * milliseconds. A "timeout" value less than 50 milliseconds is
+ * treated like a 50 millisecond timeout. A "timeout" value greater
+ * than 30 seconds is treated like a 30 second timeout. This USB stack
+ * does not allow control requests without a timeout.
  *
  * Returns:
  *    0: Success
@@ -3892,6 +3895,10 @@
 		/* timeout is too small */
 		timeout = 50;
 	}
+	if (timeout > 30000) {
+		/* timeout is too big */
+		timeout = 30000;
+	}
 	length = UGETW(req->wLength);
 
 	PRINTFN(4, ("udev=%p bmRequestType=0x%02x bRequest=0x%02x "