Commit 4c90f297 authored by Krzysztof Adamski's avatar Krzysztof Adamski Committed by Mark Brown

regmap: use proper part of work_buf for storing val

The map->work_buf is a buffer preallocated in __regmap_init() with size
allowing it to store all 3 parts of a buffer - reg, pad and val. While
reg and val parts are always properly setup before each transaction, the
pad part is left at its default value (zeros). Until it is overwritten,
that is.

_regmap_bus_read(), when calling _regmap_raw_read() uses beginning of
work_buf as a place to store data read. Usually that is fine but if
val_bits > reg_bits && pad_bits > 0, padding area of work_buf() may get
overwritten. Since padding is not zeroed before each transaction,
garbage will be used on next calls.

This patch moves the val pointer used for _regmap_raw_read() to point
to a part of work_buf intended for storing value read.
Signed-off-by: default avatarKrzysztof Adamski <krzysztof.adamski@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19
...@@ -2423,13 +2423,15 @@ static int _regmap_bus_read(void *context, unsigned int reg, ...@@ -2423,13 +2423,15 @@ static int _regmap_bus_read(void *context, unsigned int reg,
{ {
int ret; int ret;
struct regmap *map = context; struct regmap *map = context;
void *work_val = map->work_buf + map->format.reg_bytes +
map->format.pad_bytes;
if (!map->format.parse_val) if (!map->format.parse_val)
return -EINVAL; return -EINVAL;
ret = _regmap_raw_read(map, reg, map->work_buf, map->format.val_bytes); ret = _regmap_raw_read(map, reg, work_val, map->format.val_bytes);
if (ret == 0) if (ret == 0)
*val = map->format.parse_val(map->work_buf); *val = map->format.parse_val(work_val);
return ret; return ret;
} }
......
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