From owner-freebsd-usb@FreeBSD.ORG Sun Sep 6 05:40:01 2009 Return-Path: Delivered-To: freebsd-usb@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EC2B1065672 for ; Sun, 6 Sep 2009 05:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 099118FC18 for ; Sun, 6 Sep 2009 05:40:01 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n865e0aW053212 for ; Sun, 6 Sep 2009 05:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n865e0wV053211; Sun, 6 Sep 2009 05:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 6 Sep 2009 05:40:00 GMT Resent-Message-Id: <200909060540.n865e0wV053211@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-usb@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bruce Cran Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97044106566C for ; Sun, 6 Sep 2009 05:37:20 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 86C498FC21 for ; Sun, 6 Sep 2009 05:37:20 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n865bKmY043792 for ; Sun, 6 Sep 2009 05:37:20 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n865bJeL043791; Sun, 6 Sep 2009 05:37:20 GMT (envelope-from nobody) Message-Id: <200909060537.n865bJeL043791@www.freebsd.org> Date: Sun, 6 Sep 2009 05:37:20 GMT From: Bruce Cran To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: usb/138563: [usb8] [patch] Increase buffer sizes to accomodate longer USB strings X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Sep 2009 05:40:01 -0000 >Number: 138563 >Category: usb >Synopsis: [usb8] [patch] Increase buffer sizes to accomodate longer USB strings >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-usb >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Sep 06 05:40:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Bruce Cran >Release: 8.0-BETA4 >Organization: >Environment: FreeBSD gluon.draftnet 8.0-BETA4 FreeBSD 8.0-BETA4 #1: Sun Sep 6 06:09:25 BST 2009 brucec@gluon.draftnet:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: My USB mouse is detected as: ums0: on usbus3 The product name stored in the device is "Microsoft 3-Button Mouse with IntelliEye(TM)" The string gets truncated because the 'temp' buffer in sys/dev/usb/usb_device.c line 2154 only has enough space for 32 wide characters; according to http://msdn.microsoft.com/en-us/library/ms790920.aspx USB allows strings to be up to 126 wide characters. >How-To-Repeat: >Fix: Patch attached with submission follows: --- usb_device.c.orig 2009-09-06 06:14:44.000000000 +0100 +++ usb_device.c 2009-09-06 06:15:06.000000000 +0100 @@ -2151,7 +2151,7 @@ #ifdef USB_VERBOSE const struct usb_knowndev *kdp; #endif - char temp[64]; + char temp[255]; uint16_t vendor_id; uint16_t product_id; --- usb_bus.h.orig 2009-09-06 06:15:12.000000000 +0100 +++ usb_bus.h 2009-09-06 06:15:20.000000000 +0100 @@ -101,7 +101,7 @@ union { struct usb_hw_ep_scratch hw_ep_scratch[1]; struct usb_temp_setup temp_setup[1]; - uint8_t data[128]; + uint8_t data[255]; } scratch[1]; }; >Release-Note: >Audit-Trail: >Unformatted: