Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59d9445e authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Linus Torvalds
Browse files

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: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a89182c7

drivers/w1/w1_int.c

+6 −4
Original line number Diff line number Diff line
@@ -170,22 +170,24 @@ void __w1_remove_master_device(struct w1_master *dev) 


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) {

		if (!dev->initialized)

			continue;



		if (dev->bus_master->data == bm->data)

		if (dev->bus_master->data == bm->data) {

			found = dev;

			break;

		}

	}



	if (!dev) {

	if (!found) {

		printk(KERN_ERR "Device doesn't exist.\n");

		return;

	}



	__w1_remove_master_device(dev);

	__w1_remove_master_device(found);

}



EXPORT_SYMBOL(w1_add_master_device);