From owner-p4-projects@FreeBSD.ORG  Mon Oct  9 06:18:56 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4341516A40F; Mon,  9 Oct 2006 06:18:56 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1324316A403
	for <perforce@FreeBSD.org>; Mon,  9 Oct 2006 06:18:56 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D3B5543D55
	for <perforce@FreeBSD.org>; Mon,  9 Oct 2006 06:18:55 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k996ItG8066587
	for <perforce@FreeBSD.org>; Mon, 9 Oct 2006 06:18:55 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k996ItDv066569
	for perforce@freebsd.org; Mon, 9 Oct 2006 06:18:55 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 9 Oct 2006 06:18:55 GMT
Message-Id: <200610090618.k996ItDv066569@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 107531 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: Mon, 09 Oct 2006 06:18:56 -0000

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

Change 107531 by hselasky@hselasky_mini_itx on 2006/10/09 06:18:00

	ubser: Need to stop all transfers atomically at
	detach, else an outstanding clear stall transfer can
	call "usbd_transfer_start()" passing a NULL pointer.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ubser.c#8 edit

Differences ...

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

@@ -355,14 +355,24 @@
 ubser_detach(device_t dev)
 {
 	struct ubser_softc *sc = device_get_softc(dev);
+	uint8_t n;
 
 	DPRINTF(sc, 0, "\n");
 
 	ucom_detach(sc->sc_ucom, sc->sc_numser);
 
-	/* "usbd_transfer_unsetup" will stop all active
-	 * USB transfers:
+	/* need to stop all transfers atomically,
+	 * hence when clear stall completes, it
+	 * might start other transfers !
 	 */
+	mtx_lock(&Giant);
+	for (n = 0; n < UBSER_TR_MAX; n++) {
+	    if (sc->sc_xfer[n]) {
+	        usbd_transfer_stop(sc->sc_xfer[n]);
+	    }
+	}
+	mtx_unlock(&Giant);
+
 	usbd_transfer_unsetup(sc->sc_xfer, UBSER_TR_MAX);
 
 	return 0;