svn commit: r189676 - head/sys/dev/usb/controller

[Andrew Thompson]

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;
 			}
 		}