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

Commit 047a71ff authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

regulator: push allocation in set_consumer_device_supply() out of lock 



commit 5c06540165d443c6455123eb48e7f1a9b618ab34 upstream.

Pull regulator_list_mutex into set_consumer_device_supply() and keep
allocations outside of it. Fourth of the fs_reclaim deadlock case.

Fixes: 45389c47 ("regulator: core: Add early supply resolution for regulators")
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/f0380bdb3d60aeefa9693c4e234d2dcda7e56747.1597195321.git.mirq-linux@rere.qmqm.pl


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31d89652

drivers/regulator/core.c

+26 −20
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, 
				      const char *consumer_dev_name,

				      const char *supply)

{

	struct regulator_map *node;

	struct regulator_map *node, *new_node;

	int has_dev;



	if (supply == NULL)
@@ -1467,6 +1467,22 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, 
	else

		has_dev = 0;



	new_node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);

	if (new_node == NULL)

		return -ENOMEM;



	new_node->regulator = rdev;

	new_node->supply = supply;



	if (has_dev) {

		new_node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);

		if (new_node->dev_name == NULL) {

			kfree(new_node);

			return -ENOMEM;

		}

	}



	mutex_lock(&regulator_list_mutex);

	list_for_each_entry(node, &regulator_map_list, list) {

		if (node->dev_name && consumer_dev_name) {

			if (strcmp(node->dev_name, consumer_dev_name) != 0)
@@ -1484,26 +1500,19 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, 
			 node->regulator->desc->name,

			 supply,

			 dev_name(&rdev->dev), rdev_get_name(rdev));

		return -EBUSY;

		goto fail;

	}



	node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);

	if (node == NULL)

		return -ENOMEM;



	node->regulator = rdev;

	node->supply = supply;



	if (has_dev) {

		node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);

		if (node->dev_name == NULL) {

			kfree(node);

			return -ENOMEM;

		}

	}

	list_add(&new_node->list, &regulator_map_list);

	mutex_unlock(&regulator_list_mutex);



	list_add(&node->list, &regulator_map_list);

	return 0;



fail:

	mutex_unlock(&regulator_list_mutex);

	kfree(new_node->dev_name);

	kfree(new_node);

	return -EBUSY;

}



static void unset_regulator_supplies(struct regulator_dev *rdev)
@@ -5167,19 +5176,16 @@ regulator_register(const struct regulator_desc *regulator_desc, 


	/* add consumers devices */

	if (init_data) {

		mutex_lock(&regulator_list_mutex);

		for (i = 0; i < init_data->num_consumer_supplies; i++) {

			ret = set_consumer_device_supply(rdev,

				init_data->consumer_supplies[i].dev_name,

				init_data->consumer_supplies[i].supply);

			if (ret < 0) {

				mutex_unlock(&regulator_list_mutex);

				dev_err(dev, "Failed to set supply %s\n",

					init_data->consumer_supplies[i].supply);

				goto unset_supplies;

			}

		}

		mutex_unlock(&regulator_list_mutex);

	}



	if (!rdev->desc->ops->get_voltage &&