3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 52f69381c070..6f77d7319fc6 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -152,8 +152,8 @@ static int regcache_lzo_init(struct regmap *map)
          * that register.
          */
         bmp_size = map->num_reg_defaults_raw;
-        sync_bmp = kmalloc(BITS_TO_LONGS(bmp_size) * sizeof(long),
-                           GFP_KERNEL);
+        sync_bmp = kmalloc_array(BITS_TO_LONGS(bmp_size), sizeof(long),
+                                 GFP_KERNEL);
         if (!sync_bmp) {
                 ret = -ENOMEM;
                 goto err;
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 3b6cfede2fd9..9d7ced559cba 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -361,8 +361,8 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg)
                 rbnode->base_reg = reg;
         }
 
-        rbnode->block = kmalloc(rbnode->blklen * map->cache_word_size,
-                                GFP_KERNEL);
+        rbnode->block = kmalloc_array(rbnode->blklen, map->cache_word_size,
+                                      GFP_KERNEL);
         if (!rbnode->block)
                 goto err_free;
 
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 4ebbe21ded82..4d2cb21254aa 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -422,8 +422,9 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
 
         if (!map->use_single_read && map->reg_stride == 1 &&
             d->irq_reg_stride == 1) {
-                d->status_reg_buf = kmalloc(map->format.val_bytes *
-                                            chip->num_regs, GFP_KERNEL);
+                d->status_reg_buf = kmalloc_array(chip->num_regs,
+                                                  map->format.val_bytes,
+                                                  GFP_KERNEL);
                 if (!d->status_reg_buf)
                         goto err_alloc;
         }