leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] driver core: Fix races in driver_detach()

Browse Source 
This patch is intended for your "driver" tree.  It fixes several subtle
races in driver_detach() and device_release_driver() in the driver-model
core.

The major change is to use klist_remove() rather than klist_del() when
taking a device off its driver's list.  There's no other way to guarantee
that the list pointers will be updated before some other driver binds to
the device.  For this to work driver_detach() can't use a klist iterator,
so the loop over the devices must be written out in full.  In addition the
patch protects against the possibility that, when a driver and a device
are unregistered at the same time, one may be unloaded from memory before
the other is finished using it.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2005-05-06 15:38:33 -04:00 committed by Greg Kroah-Hartman
parent 6623415687
commit c95a6b057b
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/base/dd.c
View File

@ -177,33 +177,40 @@ void driver_attach(struct device_driver * drv)
* @dev: device. * @dev: device.
* *
* Manually detach device from driver. * Manually detach device from driver.
* Note that this is called without incrementing the bus *
* reference count nor taking the bus's rwsem. Be sure that * __device_release_driver() must be called with @dev->sem held.
* those are accounted for before calling this function.
*/ */
void device_release_driver(struct device * dev)
static void __device_release_driver(struct device * dev)
{ {
struct device_driver * drv; struct device_driver * drv;
down(&dev->sem); drv = dev->driver;
if (dev->driver) { if (drv) {
drv = dev->driver; get_driver(drv);
sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj)); sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
sysfs_remove_link(&dev->kobj, "driver"); sysfs_remove_link(&dev->kobj, "driver");
klist_del(&dev->knode_driver); klist_remove(&dev->knode_driver);
if (drv->remove) if (drv->remove)
drv->remove(dev); drv->remove(dev);
dev->driver = NULL; dev->driver = NULL;
put_driver(drv);
} }
}
void device_release_driver(struct device * dev)
{
/*
* If anyone calls device_release_driver() recursively from
* within their ->remove callback for the same device, they
* will deadlock right here.
*/
down(&dev->sem);
__device_release_driver(dev);
up(&dev->sem); up(&dev->sem);
} }
static int __remove_driver(struct device * dev, void * unused)
{
device_release_driver(dev);
return 0;
}
/** /**
* driver_detach - detach driver from all devices it controls. * driver_detach - detach driver from all devices it controls.
@ -211,7 +218,25 @@ static int __remove_driver(struct device * dev, void * unused)
*/ */
void driver_detach(struct device_driver * drv) void driver_detach(struct device_driver * drv)
{ {
driver_for_each_device(drv, NULL, NULL, __remove_driver); struct device * dev;
for (;;) {
spin_lock_irq(&drv->klist_devices.k_lock);
if (list_empty(&drv->klist_devices.k_list)) {
spin_unlock_irq(&drv->klist_devices.k_lock);
break;
}
dev = list_entry(drv->klist_devices.k_list.prev,
struct device, knode_driver.n_node);
get_device(dev);
spin_unlock_irq(&drv->klist_devices.k_lock);
down(&dev->sem);
if (dev->driver == drv)
__device_release_driver(dev);
up(&dev->sem);
put_device(dev);
}
} }