Commit 8497d6a2 authored by Sebastian Ott's avatar Sebastian Ott Committed by Greg Kroah-Hartman

driver-core: fix race between device_register and driver_register

When a device is registered to a bus it will be a) added to the list
of devices of the bus and b) bind to a driver (if one matches). As a
result of a driver being registered at this bus between a) and b) this
device could already be bound to a driver. This leads to a warning
and incorrect refcounting.
To fix this add a check to device_attach to identify an already bound
device.
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fc271199
...@@ -245,6 +245,10 @@ int device_attach(struct device *dev) ...@@ -245,6 +245,10 @@ int device_attach(struct device *dev)
device_lock(dev); device_lock(dev);
if (dev->driver) { if (dev->driver) {
if (klist_node_attached(&dev->p->knode_driver)) {
ret = 1;
goto out_unlock;
}
ret = device_bind_driver(dev); ret = device_bind_driver(dev);
if (ret == 0) if (ret == 0)
ret = 1; ret = 1;
...@@ -257,6 +261,7 @@ int device_attach(struct device *dev) ...@@ -257,6 +261,7 @@ int device_attach(struct device *dev)
ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach); ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
} }
out_unlock:
device_unlock(dev); device_unlock(dev);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment