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

Unverified Commit 8253bb3f authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Mark Brown
Browse files

regmap: potentially duplicate the name string stored in regmap 



Currently we just copy over the pointer passed to regmap_init() in
the regmap config struct. To be on the safe side: duplicate the string
with kstrdup_const() so that if an unaware user passes an address to
a stack-allocated buffer, we won't crash.

Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4045559c

drivers/base/regmap/regmap.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -672,6 +672,14 @@ struct regmap *__regmap_init(struct device *dev, 
		goto err;

		goto err;

	}

	}





	if (config->name) {

		map->name = kstrdup_const(config->name, GFP_KERNEL);

		if (!map->name) {

			ret = -ENOMEM;

			goto err_map;

		}

	}



	if (config->disable_locking) {

	if (config->disable_locking) {

		map->lock = map->unlock = regmap_lock_unlock_none;

		map->lock = map->unlock = regmap_lock_unlock_none;

		regmap_debugfs_disable(map);

		regmap_debugfs_disable(map);
@@ -683,7 +691,7 @@ struct regmap *__regmap_init(struct device *dev, 
		map->hwlock = hwspin_lock_request_specific(config->hwlock_id);

		map->hwlock = hwspin_lock_request_specific(config->hwlock_id);

		if (!map->hwlock) {

		if (!map->hwlock) {

			ret = -ENXIO;

			ret = -ENXIO;

			goto err_map;

			goto err_name;

		}

		}





		switch (config->hwlock_mode) {

		switch (config->hwlock_mode) {
@@ -763,7 +771,6 @@ struct regmap *__regmap_init(struct device *dev, 
	map->volatile_reg = config->volatile_reg;

	map->volatile_reg = config->volatile_reg;

	map->precious_reg = config->precious_reg;

	map->precious_reg = config->precious_reg;

	map->cache_type = config->cache_type;

	map->cache_type = config->cache_type;

	map->name = config->name;





	spin_lock_init(&map->async_lock);

	spin_lock_init(&map->async_lock);

	INIT_LIST_HEAD(&map->async_list);

	INIT_LIST_HEAD(&map->async_list);
@@ -1119,6 +1126,8 @@ struct regmap *__regmap_init(struct device *dev, 
err_hwlock:

err_hwlock:

	if (map->hwlock)

	if (map->hwlock)

		hwspin_lock_free(map->hwlock);

		hwspin_lock_free(map->hwlock);

err_name:

	kfree_const(map->name);

err_map:

err_map:

	kfree(map);

	kfree(map);

err:

err:
@@ -1308,6 +1317,7 @@ void regmap_exit(struct regmap *map) 
	}

	}

	if (map->hwlock)

	if (map->hwlock)

		hwspin_lock_free(map->hwlock);

		hwspin_lock_free(map->hwlock);

	kfree_const(map->name);

	kfree(map);

	kfree(map);

}

}

EXPORT_SYMBOL_GPL(regmap_exit);

EXPORT_SYMBOL_GPL(regmap_exit);