]> git.ipfire.org Git - people/ms/linux.git/commitdiff
regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.
authorXiubo Li <Li.Xiubo@freescale.com>
Sun, 28 Sep 2014 09:09:54 +0000 (17:09 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Oct 2014 16:43:07 +0000 (09:43 -0700)
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>
drivers/base/regmap/regmap.c

index bc80c0ea06cd5d96ba59ff413b56a08fe783531c..3a785a4f4ff6b0259b4d4082f716f0d1548d290c 100644 (file)
@@ -1659,6 +1659,9 @@ out:
        } else {
                void *wval;
 
+               if (!val_count)
+                       return -EINVAL;
+
                wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);
                if (!wval) {
                        dev_err(map->dev, "Error in memory allocation\n");