From owner-p4-projects@FreeBSD.ORG  Sat Jun 21 13:33:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5465E1065679; Sat, 21 Jun 2008 13:33:11 +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 16BBD1065672
	for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:33:11 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 05BC28FC12
	for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:33:11 +0000 (UTC)
	(envelope-from weongyo@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 m5LDXAbE042921
	for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:33:10 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LDXARr042919
	for perforce@freebsd.org; Sat, 21 Jun 2008 13:33:10 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Sat, 21 Jun 2008 13:33:10 GMT
Message-Id: <200806211333.m5LDXARr042919@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143877 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: Sat, 21 Jun 2008 13:33:11 -0000

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

Change 143877 by weongyo@weongyo_ws on 2008/06/21 13:32:41

	choice a smaller buffer to save the config descriptors that this
	provents a overwrite if the buffer to save is smaller than the 
	total size of config descriptors.

Affected files ...

.. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#7 edit

Differences ...

==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#7 (text+ko) ====

@@ -368,7 +368,7 @@
 			ctldesc->ucd_trans_buflen = 0;
 			return usbd_usb2urb(status);
 		}
-		len = UGETW(cd.wTotalLength);
+		len = MIN(UGETW(cd.wTotalLength), ctldesc->ucd_trans_buflen);
 		/* Get the full descriptor.  Try a few times for slow devices. */
 		for (i = 0; i < 3; i++) {
 			status = usbd_get_desc(uaa->device,