1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 0b344d087581..8e05c1092aef 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -126,8 +126,8 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
         if (!r1_bio)
                 return NULL;
 
-        rps = kmalloc(sizeof(struct resync_pages) * pi->raid_disks,
-                      gfp_flags);
+        rps = kmalloc_array(pi->raid_disks, sizeof(struct resync_pages),
+                            gfp_flags);
         if (!rps)
                 goto out_free_r1bio;
 
@@ -2936,9 +2936,9 @@ static struct r1conf *setup_conf(struct mddev *mddev)
         if (!conf->barrier)
                 goto abort;
 
-        conf->mirrors = kzalloc(sizeof(struct raid1_info)
-                                * mddev->raid_disks * 2,
-                                 GFP_KERNEL);
+        conf->mirrors = kzalloc(array3_size(sizeof(struct raid1_info),
+                                            mddev->raid_disks, 2),
+                                GFP_KERNEL);
         if (!conf->mirrors)
                 goto abort;
 
@@ -3241,7 +3241,8 @@ static int raid1_reshape(struct mddev *mddev)
                 kfree(newpoolinfo);
                 return ret;
         }
-        newmirrors = kzalloc(sizeof(struct raid1_info) * raid_disks * 2,
+        newmirrors = kzalloc(array3_size(sizeof(struct raid1_info),
+                                         raid_disks, 2),
                              GFP_KERNEL);
         if (!newmirrors) {
                 kfree(newpoolinfo);