[PATCH] drivers/base/bus.c: fix iteration in driver_detach()

With 2.6.11 and 2.6.12-rc2 (and perhaps a few versions before) usb
drivers for multi-interface devices, which do
usb_driver_release_interface() in their disconnect(), make rmmod hang.

It turns out to be due to a bug in drivers/base/bus.c:driver_detach(),
that iterates over the list of attached devices with
list_for_each_safe() under an assumption that device_release_driver()
only releases the current device, while it may also call
device_release_driver() for other devices on the same list.

The following patch fixes it.  Please consider applying.

Signed-off-by: Roman Kagan <rkagan@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roman Kagan 2005-04-13 21:40:17 +04:00 committed by Greg KH
parent 177a432494
commit b2d84f078a

View file

@ -405,9 +405,8 @@ void device_release_driver(struct device * dev)
static void driver_detach(struct device_driver * drv) static void driver_detach(struct device_driver * drv)
{ {
struct list_head * entry, * next; while (!list_empty(&drv->devices)) {
list_for_each_safe(entry, next, &drv->devices) { struct device * dev = container_of(drv->devices.next, struct device, driver_list);
struct device * dev = container_of(entry, struct device, driver_list);
device_release_driver(dev); device_release_driver(dev);
} }
} }