diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2015-08-30 09:33:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-30 10:19:22 +0100 |
| commit | c335931ed9d22c30017cf957518262c2fe6502ce (patch) | |
| tree | d5468748135748a6bad1e728af55adb7af909b53 /drivers/base | |
| parent | f50c9eb4e9304cf555206c93152f580c0e7213b2 (diff) | |
| download | linux-c335931ed9d22c30017cf957518262c2fe6502ce.tar.gz | |
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: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 47210101e308..d2efa4b33294 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1584,6 +1584,8 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, return -EINVAL; if (val_len % map->format.val_bytes) return -EINVAL; + if (map->max_raw_write && map->max_raw_write > val_len) + return -E2BIG; map->lock(map->lock_arg); @@ -2256,6 +2258,10 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val, ret = -ENOTSUPP; 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 */ ret = _regmap_raw_read(map, reg, val, val_len); |