Commit 25118084 authored Jul 22, 2009 by Alan Stern Committed by Greg Kroah-Hartman Sep 23, 2009

USB: check for hub driver not bound to root hub device



This patch (as1267) changes usb_kick_khubd() and hdev_to_hub() to make
them more resilient against situations where a hub device isn't bound
to the hub driver.  The code assumes that if a root hub was
successfully registered then it must be bound to the hub driver.

But this assumption can fail if the user manually unbinds the hub
driver, or more importantly, if the host controller dies causing
usb_set_configuration to fail.

To protect against these possibilities, make hdev_to_hub() check that
the hub device is configured before dereferencing the active
configuration, and make usb_kick_khubd() check that the pointer to the
hub's private data structure isn't NULL.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 81e5b23c

drivers/usb/core/hub.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -163,8 +163,10 @@ static inline char *portspeed(int portstatus)
		}

		/* Note that hdev or one of its children must be locked! */
		static inline struct usb_hub hdev_to_hub(struct usb_device hdev)
		static struct usb_hub hdev_to_hub(struct usb_device hdev)
		{
		if (!hdev \|\| !hdev->actconfig)
		return NULL;
		return usb_get_intfdata(hdev->actconfig->interface[0]);
		}

		@@ -385,8 +387,10 @@ static void kick_khubd(struct usb_hub *hub)

		void usb_kick_khubd(struct usb_device *hdev)
		{
		/* FIXME: What if hdev isn't bound to the hub driver? */
		kick_khubd(hdev_to_hub(hdev));
		struct usb_hub *hub = hdev_to_hub(hdev);

		if (hub)
		kick_khubd(hub);
		}

Admin message