iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: free children in spi_unregister_master, not siblings

Browse Source 
introduced by 49dce689 ("spi doesn't need class_device") and bad-fixed
by 350d0076 ("spi: fix double-free on spi_unregister_master"),
spi_unregister_master would previously device_unregister all of the spi
master's siblings (instead of its children). hilarity ensues.

fix it to unregister children.

Signed-off-by: David Lamparter <equinox@diac24.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
David Lamparter 2010-08-30 23:54:17 +02:00 committed by Grant Likely
parent 4e4438b865
commit 34860089c9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/spi/spi.c
View File

@ -554,10 +554,8 @@ done:
EXPORT_SYMBOL_GPL(spi_register_master); EXPORT_SYMBOL_GPL(spi_register_master);
static int __unregister(struct device *dev, void *master_dev) static int __unregister(struct device *dev, void *null)
{ {
/* note: before about 2.6.14-rc1 this would corrupt memory: */
if (dev != master_dev)
spi_unregister_device(to_spi_device(dev)); spi_unregister_device(to_spi_device(dev));
return 0; return 0;
} }
@ -576,8 +574,7 @@ void spi_unregister_master(struct spi_master *master)
{ {
int dummy; int dummy;
dummy = device_for_each_child(master->dev.parent, &master->dev, dummy = device_for_each_child(&master->dev, NULL, __unregister);
__unregister);
device_unregister(&master->dev); device_unregister(&master->dev);
} }
EXPORT_SYMBOL_GPL(spi_unregister_master); EXPORT_SYMBOL_GPL(spi_unregister_master);