diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-09-28 17:09:54 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 09:38:20 -0700 |
| commit | 2f06fa04cf35da5c24481da3ac84a2900d0b99c3 (patch) | |
| tree | b1ab4f4bd23db7cc57c474f3af4211fc300c73df /drivers/base | |
| parent | e2fe6c3046ba3a75b3228181a34831b9bb8ee861 (diff) | |
| download | lwn-2f06fa04cf35da5c24481da3ac84a2900d0b99c3.tar.gz lwn-2f06fa04cf35da5c24481da3ac84a2900d0b99c3.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -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 5277f9a80c2c..f6cff3be0ed7 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1557,6 +1557,9 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, } else { void *wval; + if (!val_count) + return -EINVAL; + wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL); if (!wval) { ret = -ENOMEM; |