From owner-svn-src-head@FreeBSD.ORG  Wed Mar 11 04:56:31 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DFE1106564A;
	Wed, 11 Mar 2009 04:56:31 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BE7A8FC12;
	Wed, 11 Mar 2009 04:56:31 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2B4uVso084617;
	Wed, 11 Mar 2009 04:56:31 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2B4uVLY084616;
	Wed, 11 Mar 2009 04:56:31 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200903110456.n2B4uVLY084616@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Wed, 11 Mar 2009 04:56:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189676 - head/sys/dev/usb/controller
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2009 04:56:31 -0000

Author: thompsa
Date: Wed Mar 11 04:56:30 2009
New Revision: 189676
URL: http://svn.freebsd.org/changeset/base/189676

Log:
  Fix a possible NULL pointer access at controller attach.
  
  Submitted by:	Hans Petter Selasky

Modified:
  head/sys/dev/usb/controller/usb_controller.c

Modified: head/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- head/sys/dev/usb/controller/usb_controller.c	Wed Mar 11 03:19:19 2009	(r189675)
+++ head/sys/dev/usb/controller/usb_controller.c	Wed Mar 11 04:56:30 2009	(r189676)
@@ -346,7 +346,8 @@ usb2_bus_attach(struct usb2_proc_msg *pm
 		err = usb2_probe_and_attach(child,
 		    USB_IFACE_INDEX_ANY);
 		if (!err) {
-			if (!bus->devices[USB_ROOT_HUB_ADDR]->hub) {
+			if ((bus->devices[USB_ROOT_HUB_ADDR] == NULL) ||
+			    (bus->devices[USB_ROOT_HUB_ADDR]->hub == NULL)) {
 				err = USB_ERR_NO_ROOT_HUB;
 			}
 		}