8 files changed, 24 insertions, 15 deletions

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 3d08dc84db16..51000914e23f 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -331,8 +331,8 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,
         if (rep.nr_zones > INT_MAX / sizeof(struct blk_zone))
                 return -ERANGE;
 
-        zones = kvmalloc(rep.nr_zones * sizeof(struct blk_zone),
-                        GFP_KERNEL | __GFP_ZERO);
+        zones = kvmalloc_array(rep.nr_zones, sizeof(struct blk_zone),
+                               GFP_KERNEL | __GFP_ZERO);
         if (!zones)
                 return -ENOMEM;
 
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 9bff853e85f3..3c5ea7cb693e 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -524,7 +524,8 @@ retry:
                                 pr_warn(FW_WARN "too many record IDs!\n");
                         return 0;
                 }
-                new_entries = kvmalloc(new_size * sizeof(entries[0]), GFP_KERNEL);
+                new_entries = kvmalloc_array(new_size, sizeof(entries[0]),
+                                             GFP_KERNEL);
                 if (!new_entries)
                         return -ENOMEM;
                 memcpy(new_entries, entries,
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
index 39808489f21d..92e363dbbc5a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
@@ -191,9 +191,9 @@ nvkm_mem_new_host(struct nvkm_mmu *mmu, int type, u8 page, u64 size,
         nvkm_memory_ctor(&nvkm_mem_dma, &mem->memory);
         size = ALIGN(size, PAGE_SIZE) >> PAGE_SHIFT;
 
-        if (!(mem->mem = kvmalloc(sizeof(*mem->mem) * size, GFP_KERNEL)))
+        if (!(mem->mem = kvmalloc_array(size, sizeof(*mem->mem), GFP_KERNEL)))
                 return -ENOMEM;
-        if (!(mem->dma = kvmalloc(sizeof(*mem->dma) * size, GFP_KERNEL)))
+        if (!(mem->dma = kvmalloc_array(size, sizeof(*mem->dma), GFP_KERNEL)))
                 return -ENOMEM;
 
         if (mmu->dma_bits > 32)
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 136e7e66d870..86438b2f10dd 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -2448,7 +2448,9 @@ static struct scatterlist **dm_integrity_alloc_journal_scatterlist(struct dm_int
         struct scatterlist **sl;
         unsigned i;
 
-        sl = kvmalloc(ic->journal_sections * sizeof(struct scatterlist *), GFP_KERNEL | __GFP_ZERO);
+        sl = kvmalloc_array(ic->journal_sections,
+                            sizeof(struct scatterlist *),
+                            GFP_KERNEL | __GFP_ZERO);
         if (!sl)
                 return NULL;
 
@@ -2464,7 +2466,8 @@ static struct scatterlist **dm_integrity_alloc_journal_scatterlist(struct dm_int
 
                 n_pages = (end_index - start_index + 1);
 
-                s = kvmalloc(n_pages * sizeof(struct scatterlist), GFP_KERNEL);
+                s = kvmalloc_array(n_pages, sizeof(struct scatterlist),
+                                   GFP_KERNEL);
                 if (!s) {
                         dm_integrity_free_journal_scatterlist(ic, sl);
                         return NULL;
@@ -2643,7 +2646,9 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
                                 goto bad;
                         }
 
-                        sg = kvmalloc((ic->journal_pages + 1) * sizeof(struct scatterlist), GFP_KERNEL);
+                        sg = kvmalloc_array(ic->journal_pages + 1,
+                                            sizeof(struct scatterlist),
+                                            GFP_KERNEL);
                         if (!sg) {
                                 *error = "Unable to allocate sg list";
                                 r = -ENOMEM;
@@ -2709,7 +2714,9 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
                                 r = -ENOMEM;
                                 goto bad;
                         }
-                        ic->sk_requests = kvmalloc(ic->journal_sections * sizeof(struct skcipher_request *), GFP_KERNEL | __GFP_ZERO);
+                        ic->sk_requests = kvmalloc_array(ic->journal_sections,
+                                                         sizeof(struct skcipher_request *),
+                                                         GFP_KERNEL | __GFP_ZERO);
                         if (!ic->sk_requests) {
                                 *error = "Unable to allocate sk requests";
                                 r = -ENOMEM;
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 8cac07ab60ab..6d1a5e58968f 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -322,7 +322,7 @@ static int evtchn_resize_ring(struct per_user_data *u)
         else
                 new_size = 2 * u->ring_size;
 
-        new_ring = kvmalloc(new_size * sizeof(*new_ring), GFP_KERNEL);
+        new_ring = kvmalloc_array(new_size, sizeof(*new_ring), GFP_KERNEL);
         if (!new_ring)
                 return -ENOMEM;
 
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 00fe75a71c4b..0c4c2201b3aa 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3993,9 +3993,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                         goto failed_mount;
                 }
         }
-        sbi->s_group_desc = kvmalloc(db_count *
-                                          sizeof(struct buffer_head *),
-                                          GFP_KERNEL);
+        sbi->s_group_desc = kvmalloc_array(db_count,
+                                           sizeof(struct buffer_head *),
+                                           GFP_KERNEL);
         if (sbi->s_group_desc == NULL) {
                 ext4_msg(sb, KERN_ERR, "not enough memory");
                 ret = -ENOMEM;
diff --git a/ipc/sem.c b/ipc/sem.c
index cfd94d48a9aa..59a3cd1d3252 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1945,7 +1945,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops,
         if (nsops > ns->sc_semopm)
                 return -E2BIG;
         if (nsops > SEMOPM_FAST) {
-                sops = kvmalloc(sizeof(*sops)*nsops, GFP_KERNEL);
+                sops = kvmalloc_array(nsops, sizeof(*sops), GFP_KERNEL);
                 if (sops == NULL)
                         return -ENOMEM;
         }
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c
index 44c39c5f0638..10ae13560b40 100644
--- a/net/ipv6/ila/ila_xlat.c
+++ b/net/ipv6/ila/ila_xlat.c
@@ -42,7 +42,8 @@ static int alloc_ila_locks(struct ila_net *ilan)
         size = roundup_pow_of_two(nr_pcpus * LOCKS_PER_CPU);
 
         if (sizeof(spinlock_t) != 0) {
-                ilan->locks = kvmalloc(size * sizeof(spinlock_t), GFP_KERNEL);
+                ilan->locks = kvmalloc_array(size, sizeof(spinlock_t),
+                                             GFP_KERNEL);
                 if (!ilan->locks)
                         return -ENOMEM;
                 for (i = 0; i < size; i++)