浏览代码

device-core: Ensure drvdata = NULL when no driver is bound

1) drvdata is for a driver to store a pointer to driver specific data
2) If no driver is bound, there is no driver specific data associated with
   the device
3) Thus logically drvdata should be NULL if no driver is bound.

But many drivers don't clear drvdata on device_release, or set drvdata
early on in probe and leave it set on probe error. Both of which results
in a dangling pointer in drvdata.

This patch enforce for drvdata to be NULL after device_release or on probe
failure.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hans de Goede 13 年之前
父节点
当前提交
0998d06310
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      drivers/base/dd.c

+ 2 - 0
drivers/base/dd.c

@@ -283,6 +283,7 @@ probe_failed:
 	devres_release_all(dev);
 	devres_release_all(dev);
 	driver_sysfs_remove(dev);
 	driver_sysfs_remove(dev);
 	dev->driver = NULL;
 	dev->driver = NULL;
+	dev_set_drvdata(dev, NULL);
 
 
 	if (ret == -EPROBE_DEFER) {
 	if (ret == -EPROBE_DEFER) {
 		/* Driver requested deferred probing */
 		/* Driver requested deferred probing */
@@ -487,6 +488,7 @@ static void __device_release_driver(struct device *dev)
 			drv->remove(dev);
 			drv->remove(dev);
 		devres_release_all(dev);
 		devres_release_all(dev);
 		dev->driver = NULL;
 		dev->driver = NULL;
+		dev_set_drvdata(dev, NULL);
 		klist_remove(&dev->p->knode_driver);
 		klist_remove(&dev->p->knode_driver);
 		if (dev->bus)
 		if (dev->bus)
 			blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
 			blocking_notifier_call_chain(&dev->bus->p->bus_notifier,