From owner-p4-projects@FreeBSD.ORG  Tue Sep  8 15:40:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4541C1065676; Tue,  8 Sep 2009 15:40:34 +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 0A1951065692
	for <perforce@FreeBSD.org>; Tue,  8 Sep 2009 15:40:34 +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 EC44A8FC20
	for <perforce@FreeBSD.org>; Tue,  8 Sep 2009 15:40:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n88FeX7t068334
	for <perforce@FreeBSD.org>; Tue, 8 Sep 2009 15:40:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n88FeXee068332
	for perforce@freebsd.org; Tue, 8 Sep 2009 15:40:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 8 Sep 2009 15:40:33 GMT
Message-Id: <200909081540.n88FeXee068332@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 168331 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, 08 Sep 2009 15:40:34 -0000

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

Change 168331 by hselasky@hselasky_laptop001 on 2009/09/08 15:39:44

	
	USB CORE:
	 - Correct buffer sizes used so that they match.
	   The old code could give the impression that a possible
	   overflow situation existed. That is not the case.
	
	 - Reported by: Kostik Belousov

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#54 edit

Differences ...

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

@@ -2359,6 +2359,7 @@
 {
 	char *data = NULL;
 	struct malloc_type *mt;
+	const size_t buf_size = 512;
 
 	mtx_lock(&malloc_mtx);
 	mt = malloc_desc2type("bus");	/* XXX M_BUS */
@@ -2366,12 +2367,12 @@
 	if (mt == NULL)
 		return;
 
-	data = malloc(512, mt, M_NOWAIT);
+	data = malloc(buf_size, mt, M_NOWAIT);
 	if (data == NULL)
 		return;
 
 	/* String it all together. */
-	snprintf(data, 1024,
+	snprintf(data, buf_size,
 	    "%s"
 	    "%s "
 	    "vendor=0x%04x "