From owner-p4-projects@FreeBSD.ORG  Thu Aug 13 12:45:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0B8631065702; Thu, 13 Aug 2009 12:45:03 +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 B49A310656FD
	for <perforce@FreeBSD.org>; Thu, 13 Aug 2009 12:45:02 +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 D1E298FC45
	for <perforce@FreeBSD.org>; Thu, 13 Aug 2009 12:45:01 +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 n7DCj1T1073199
	for <perforce@FreeBSD.org>; Thu, 13 Aug 2009 12:45:01 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7DCj17O073197
	for perforce@freebsd.org; Thu, 13 Aug 2009 12:45:01 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 13 Aug 2009 12:45:01 GMT
Message-Id: <200908131245.n7DCj17O073197@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 167286 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: Thu, 13 Aug 2009 12:45:04 -0000

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

Change 167286 by hselasky@hselasky_laptop001 on 2009/08/13 12:44:04

	
	USB CORE:
	 - fix memory use after free race for USB character devices.
	 - reported by Lucius Windschuh

Affected files ...

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

Differences ...

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

@@ -1901,15 +1901,18 @@
 usb_cdev_free(struct usb_device *udev)
 {
 	struct usb_fs_privdata* pd;
+	struct cdev* pcdev;
 
 	DPRINTFN(2, "Freeing device nodes\n");
 
 	while ((pd = LIST_FIRST(&udev->pd_list)) != NULL) {
 		KASSERT(pd->cdev->si_drv1 == pd, ("privdata corrupt"));
 
-		destroy_dev_sched_cb(pd->cdev, usb_cdev_cleanup, pd);
+		pcdev = pd->cdev;
 		pd->cdev = NULL;
 		LIST_REMOVE(pd, pd_next);
+		if (pcdev != NULL)
+			destroy_dev_sched_cb(pcdev, usb_cdev_cleanup, pd);
 	}
 }