Skip to content

Commit

Permalink
regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.
Browse files Browse the repository at this point in the history
commit d6b41cb 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>
  • Loading branch information
Xiubo Li authored and Jiri Slaby committed Oct 31, 2014
1 parent 9411375 commit a0b8d8d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a0b8d8d

Please sign in to comment.