1 files changed, 19 insertions, 17 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 3a9eca163db8..af0e628ff396 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1923,8 +1923,8 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h,
         }
         spin_unlock_irqrestore(&h->reset_lock, flags);
 
-        added = kzalloc(sizeof(*added) * HPSA_MAX_DEVICES, GFP_KERNEL);
-        removed = kzalloc(sizeof(*removed) * HPSA_MAX_DEVICES, GFP_KERNEL);
+        added = kcalloc(HPSA_MAX_DEVICES, sizeof(*added), GFP_KERNEL);
+        removed = kcalloc(HPSA_MAX_DEVICES, sizeof(*removed), GFP_KERNEL);
 
         if (!added || !removed) {
                 dev_warn(&h->pdev->dev, "out of memory in "
@@ -2171,14 +2171,15 @@ static int hpsa_allocate_ioaccel2_sg_chain_blocks(struct ctlr_info *h)
                 return 0;
 
         h->ioaccel2_cmd_sg_list =
-                kzalloc(sizeof(*h->ioaccel2_cmd_sg_list) * h->nr_cmds,
+                kcalloc(h->nr_cmds, sizeof(*h->ioaccel2_cmd_sg_list),
                                         GFP_KERNEL);
         if (!h->ioaccel2_cmd_sg_list)
                 return -ENOMEM;
         for (i = 0; i < h->nr_cmds; i++) {
                 h->ioaccel2_cmd_sg_list[i] =
-                        kmalloc(sizeof(*h->ioaccel2_cmd_sg_list[i]) *
-                                        h->maxsgentries, GFP_KERNEL);
+                        kmalloc_array(h->maxsgentries,
+                                      sizeof(*h->ioaccel2_cmd_sg_list[i]),
+                                      GFP_KERNEL);
                 if (!h->ioaccel2_cmd_sg_list[i])
                         goto clean;
         }
@@ -2210,14 +2211,15 @@ static int hpsa_alloc_sg_chain_blocks(struct ctlr_info *h)
         if (h->chainsize <= 0)
                 return 0;
 
-        h->cmd_sg_list = kzalloc(sizeof(*h->cmd_sg_list) * h->nr_cmds,
-                                GFP_KERNEL);
+        h->cmd_sg_list = kcalloc(h->nr_cmds, sizeof(*h->cmd_sg_list),
+                                 GFP_KERNEL);
         if (!h->cmd_sg_list)
                 return -ENOMEM;
 
         for (i = 0; i < h->nr_cmds; i++) {
-                h->cmd_sg_list[i] = kmalloc(sizeof(*h->cmd_sg_list[i]) *
-                                                h->chainsize, GFP_KERNEL);
+                h->cmd_sg_list[i] = kmalloc_array(h->chainsize,
+                                                  sizeof(*h->cmd_sg_list[i]),
+                                                  GFP_KERNEL);
                 if (!h->cmd_sg_list[i])
                         goto clean;
 
@@ -4319,7 +4321,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h)
         bool physical_device;
         DECLARE_BITMAP(lunzerobits, MAX_EXT_TARGETS);
 
-        currentsd = kzalloc(sizeof(*currentsd) * HPSA_MAX_DEVICES, GFP_KERNEL);
+        currentsd = kcalloc(HPSA_MAX_DEVICES, sizeof(*currentsd), GFP_KERNEL);
         physdev_list = kzalloc(sizeof(*physdev_list), GFP_KERNEL);
         logdev_list = kzalloc(sizeof(*logdev_list), GFP_KERNEL);
         tmpdevice = kzalloc(sizeof(*tmpdevice), GFP_KERNEL);
@@ -6402,12 +6404,12 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
                 status = -EINVAL;
                 goto cleanup1;
         }
-        buff = kzalloc(SG_ENTRIES_IN_CMD * sizeof(char *), GFP_KERNEL);
+        buff = kcalloc(SG_ENTRIES_IN_CMD, sizeof(char *), GFP_KERNEL);
         if (!buff) {
                 status = -ENOMEM;
                 goto cleanup1;
         }
-        buff_size = kmalloc(SG_ENTRIES_IN_CMD * sizeof(int), GFP_KERNEL);
+        buff_size = kmalloc_array(SG_ENTRIES_IN_CMD, sizeof(int), GFP_KERNEL);
         if (!buff_size) {
                 status = -ENOMEM;
                 goto cleanup1;
@@ -7151,7 +7153,7 @@ static int controller_reset_failed(struct CfgTable __iomem *cfgtable)
         char *driver_ver, *old_driver_ver;
         int rc, size = sizeof(cfgtable->driver_version);
 
-        old_driver_ver = kmalloc(2 * size, GFP_KERNEL);
+        old_driver_ver = kmalloc_array(2, size, GFP_KERNEL);
         if (!old_driver_ver)
                 return -ENOMEM;
         driver_ver = old_driver_ver + size;
@@ -7931,9 +7933,9 @@ static void hpsa_free_cmd_pool(struct ctlr_info *h)
 
 static int hpsa_alloc_cmd_pool(struct ctlr_info *h)
 {
-        h->cmd_pool_bits = kzalloc(
-                DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG) *
-                sizeof(unsigned long), GFP_KERNEL);
+        h->cmd_pool_bits = kcalloc(DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG),
+                                   sizeof(unsigned long),
+                                   GFP_KERNEL);
         h->cmd_pool = pci_alloc_consistent(h->pdev,
                     h->nr_cmds * sizeof(*h->cmd_pool),
                     &(h->cmd_pool_dhandle));
@@ -8507,7 +8509,7 @@ static struct ctlr_info *hpda_alloc_ctlr_info(void)
         if (!h)
                 return NULL;
 
-        h->reply_map = kzalloc(sizeof(*h->reply_map) * nr_cpu_ids, GFP_KERNEL);
+        h->reply_map = kcalloc(nr_cpu_ids, sizeof(*h->reply_map), GFP_KERNEL);
         if (!h->reply_map) {
                 kfree(h);
                 return NULL;