diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-09-28 17:09:54 +0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-31 15:11:11 +0100 |
| commit | a0b8d8d906d267987d507138003048c5fdf77473 (patch) | |
| tree | 3bbf2239003bfadfa046333fa60848aca2ceac5d | |
| parent | 94113759ec0fda45201a214418558164187c03a4 (diff) | |
regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.
commit d6b41cb06044a7d895db82bdd54f6e4219970510 upstream.
Since we cannot make sure the 'val_count' will always be none zero
here, and then if it equals to zero, the kmemdup() will return
ZERO_SIZE_PTR, which equals to ((void *)16).
So this patch fix this with just doing the zero check before calling
kmemdup().
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/base/regmap/regmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index cd5c5bffac87..7a58be457eb5 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1403,6 +1403,9 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, if (val_bytes == 1) { wval = (void *)val; } else { + if (!val_count) + return -EINVAL; + wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL); if (!wval) { ret = -ENOMEM; |