openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case" 

This reverts commit ded9db380d.

Thierry Reding writes:
	This causes a boot regression on at least one board, caused by
	one of the drivers looking at driver data to check whether or
	not the driver has properly loaded. If the code encounters a
	non-NULL pointer it tries to dereference it, but because it's
	already been freed there is no memory backing it and things
	crash.

	I don't think keeping stale pointers around is a good idea. The
	whole point of setting this to NULL in the core is so that probe
	failures result in the same starting conditions no matter what.

	Can we please get this reverted?

Reported-by: Thierry Reding <thierry.reding@gmail.com>
Cc: Yi Zhang <yizhang_hust@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2016-05-03 08:06:06 -07:00
parent cc736607c8
commit c6e360a0d9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/base/dd.c
View File

@ -402,8 +402,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
devres_release_all(dev); devres_release_all(dev);
driver_sysfs_remove(dev); driver_sysfs_remove(dev);
dev->driver = NULL; dev->driver = NULL;
if (ret != -EPROBE_DEFER) dev_set_drvdata(dev, NULL);
dev_set_drvdata(dev, NULL);
if (dev->pm_domain && dev->pm_domain->dismiss) if (dev->pm_domain && dev->pm_domain->dismiss)
dev->pm_domain->dismiss(dev); dev->pm_domain->dismiss(dev);
pm_runtime_reinit(dev); pm_runtime_reinit(dev);