From 02a143df1f2dd43c85a9ce0e383bf785aafebe64 Mon Sep 17 00:00:00 2001 From: thompsa Date: Wed, 11 Mar 2009 04:56:30 +0000 Subject: [PATCH] Fix a possible NULL pointer access at controller attach. Submitted by: Hans Petter Selasky --- sys/dev/usb/controller/usb_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index b91be6c041f..f835ec1fb5f 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -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; } } -- 2.45.2