From owner-freebsd-usb@FreeBSD.ORG Tue May 10 18:00:25 2005 Return-Path: Delivered-To: freebsd-usb@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADCCF16A4E8 for ; Tue, 10 May 2005 18:00:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 718EC43DB2 for ; Tue, 10 May 2005 18:00:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4AI0OPY087780 for ; Tue, 10 May 2005 18:00:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4AI0O3F087777; Tue, 10 May 2005 18:00:24 GMT (envelope-from gnats) Resent-Date: Tue, 10 May 2005 18:00:24 GMT Resent-Message-Id: <200505101800.j4AI0O3F087777@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, hselasky@c2i.net Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 824F016A4CE for ; Tue, 10 May 2005 17:51:11 +0000 (GMT) Received: from swip.net (mailfe08.swip.net [212.247.154.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4980243D60 for ; Tue, 10 May 2005 17:51:10 +0000 (GMT) (envelope-from hselasky@c2i.net) Received: from mp-217-228-222.daxnet.no ([193.217.228.222] verified) by mailfe08.swip.net (CommuniGate Pro SMTP 4.3c5) with ESMTP id 164624815 for FreeBSD-gnats-submit@freebsd.org; Tue, 10 May 2005 19:51:08 +0200 Message-Id: <200505101951.52740.hselasky@c2i.net> Date: Tue, 10 May 2005 19:51:51 +0200 From: Hans Petter Selasky To: FreeBSD-gnats-submit@FreeBSD.org Subject: usb/80862: USB locking issues X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: hselasky@c2i.net List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2005 18:00:25 -0000 >Number: 80862 >Category: usb >Synopsis: USB locking issues >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-usb >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 10 18:00:24 GMT 2005 >Closed-Date: >Last-Modified: >Originator: HPS >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 6.0-CURRENT FreeBSD 6.0-CURRENT #45: Mon Mar 21 15:40:17 CET 2005 root@:/usr/obj/usr/src/sys/custom i386 >Description: I'm not sure if "sysctl" calls are under Giant, but "uhub_child_xxxx()" are called from sysctl context, and should lock Giant or assert Giant. Secondly these calls should not sleep, because then Giant will be exited, and the "usb_event_thread()" can detach the USB-device meanwhile. >How-To-Repeat: >Fix: In the file "/sys/dev/usb/uhub.c": uhub_child_location_str() { ... mtx_lock(&Giant); /* missing */ ... mtx_unlock(&Giant); } uhub_child_pnpinfo_str() { ... mtx_lock(&Giant); /* missing */ This must be moved into "usbd_new_device()", because it can sleep: serial[0] = '\0'; (void)usbd_get_string(dev, dev->ddesc.iSerialNumber, &serial[0]); Instead something like: strcpy(&serial[0], &dev->serial[0]); must be used. Or just replace "serial" with "dev->serial". ... mtx_unlock(&Giant); } usbd_new_device() { ... udev->serial[0] = '\0'; (void)usbd_get_string(dev, udev->ddesc.iSerialNumber, &udev->serial[0] /* nice with a length parameter here to limit the length of the serial number */); /* format checking */ for(i = 0;;i++) { if(udev->serial[i] == '\0') break; if(udev->serial[i] == '\"') udev->serial[i] = ' '; if(udev->serial[i] == '\n') udev->serial[i] = ' '; } ... } Something else: Should allow root hub to detach: static driver_t uhubroot_driver = { ... DEVMETHOD(device_detach, uhub_detach), ... } >Release-Note: >Audit-Trail: >Unformatted: