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

Commit 851960ba authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

regmap: validate regmap_raw_read/write val_len 



val_len should be a multiple of val_bytes. If it's not, error out early.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9878647f

drivers/base/regmap/regmap.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -595,6 +595,9 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, 
{

{

	int ret;

	int ret;





	if (val_len % map->format.val_bytes)

		return -EINVAL;



	map->lock(map);

	map->lock(map);





	ret = _regmap_raw_write(map, reg, val, val_len);

	ret = _regmap_raw_write(map, reg, val, val_len);
@@ -753,6 +756,9 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val, 
	unsigned int v;

	unsigned int v;

	int ret, i;

	int ret, i;





	if (val_len % map->format.val_bytes)

		return -EINVAL;



	map->lock(map);

	map->lock(map);





	if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass ||

	if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass ||