Commit c335931e authored by Markus Pargmann's avatar Markus Pargmann Committed by Mark Brown

regmap: Add raw_write/read checks for max_raw_write/read sizes

Check in regmap_raw_read() and regmap_raw_write() for correct maximum
sizes of the operations. Return -E2BIG if this size is not supported
because it is too big.

Also this patch causes an uninitialized variable warning so it
initializes ret (although not necessary).
Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f50c9eb4
...@@ -1584,6 +1584,8 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, ...@@ -1584,6 +1584,8 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
return -EINVAL; return -EINVAL;
if (val_len % map->format.val_bytes) if (val_len % map->format.val_bytes)
return -EINVAL; return -EINVAL;
if (map->max_raw_write && map->max_raw_write > val_len)
return -E2BIG;
map->lock(map->lock_arg); map->lock(map->lock_arg);
...@@ -2256,6 +2258,10 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val, ...@@ -2256,6 +2258,10 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
ret = -ENOTSUPP; ret = -ENOTSUPP;
goto out; goto out;
} }
if (map->max_raw_read && map->max_raw_read < val_len) {
ret = -E2BIG;
goto out;
}
/* Physical block read if there's no cache involved */ /* Physical block read if there's no cache involved */
ret = _regmap_raw_read(map, reg, val, val_len); ret = _regmap_raw_read(map, reg, val, val_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment