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

Commit 021cd616 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

regmap: Fix memory leak in regcache_hw_init error path 



Make sure reg_defaults_raw gets freed in case of an error.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent abbb18fb

drivers/base/regmap/regcache.c

+10 −2
Original line number Diff line number Diff line
@@ -61,8 +61,10 @@ static int regcache_hw_init(struct regmap *map) 


	map->reg_defaults = kmalloc(count * sizeof(struct reg_default),

				      GFP_KERNEL);

	if (!map->reg_defaults)

		return -ENOMEM;

	if (!map->reg_defaults) {

		ret = -ENOMEM;

		goto err_free;

	}



	/* fill the reg_defaults */

	map->num_reg_defaults = count;
@@ -77,6 +79,12 @@ static int regcache_hw_init(struct regmap *map) 
	}



	return 0;



err_free:

	if (map->cache_free)

		kfree(map->reg_defaults_raw);



	return ret;

}



int regcache_init(struct regmap *map)