mirror of
https://github.com/torvalds/linux.git
synced 2024-10-25 06:31:06 +00:00
w1: fix w1_remove_master_device() searching
In case bus master driver provided bogus value as its private data, search can be incorrect. Problem found by Adrian Bunk. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Cc: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a89182c76e
commit
59d9445e85
|
@ -170,22 +170,24 @@ void __w1_remove_master_device(struct w1_master *dev)
|
||||||
|
|
||||||
void w1_remove_master_device(struct w1_bus_master *bm)
|
void w1_remove_master_device(struct w1_bus_master *bm)
|
||||||
{
|
{
|
||||||
struct w1_master *dev = NULL;
|
struct w1_master *dev, *found = NULL;
|
||||||
|
|
||||||
list_for_each_entry(dev, &w1_masters, w1_master_entry) {
|
list_for_each_entry(dev, &w1_masters, w1_master_entry) {
|
||||||
if (!dev->initialized)
|
if (!dev->initialized)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (dev->bus_master->data == bm->data)
|
if (dev->bus_master->data == bm->data) {
|
||||||
|
found = dev;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dev) {
|
if (!found) {
|
||||||
printk(KERN_ERR "Device doesn't exist.\n");
|
printk(KERN_ERR "Device doesn't exist.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
__w1_remove_master_device(dev);
|
__w1_remove_master_device(found);
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(w1_add_master_device);
|
EXPORT_SYMBOL(w1_add_master_device);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user