4 files changed, 16 insertions, 8 deletions

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 9624a8f7254b..9f1c96caebda 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -806,7 +806,8 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi)
         block_t cp_blk_no;
         int i;
 
-        sbi->ckpt = f2fs_kzalloc(sbi, cp_blks * blk_size, GFP_KERNEL);
+        sbi->ckpt = f2fs_kzalloc(sbi, array_size(blk_size, cp_blks),
+                                 GFP_KERNEL);
         if (!sbi->ckpt)
                 return -ENOMEM;
         /*
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 47d0e64a95a8..53e5bc6f9efb 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2753,8 +2753,10 @@ static int init_free_nid_cache(struct f2fs_sb_info *sbi)
         struct f2fs_nm_info *nm_i = NM_I(sbi);
         int i;
 
-        nm_i->free_nid_bitmap = f2fs_kzalloc(sbi, nm_i->nat_blocks *
-                                sizeof(unsigned char *), GFP_KERNEL);
+        nm_i->free_nid_bitmap =
+                f2fs_kzalloc(sbi, array_size(sizeof(unsigned char *),
+                                             nm_i->nat_blocks),
+                             GFP_KERNEL);
         if (!nm_i->free_nid_bitmap)
                 return -ENOMEM;
 
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 6dbdf2c48fba..50a10f512051 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3635,7 +3635,8 @@ static int build_curseg(struct f2fs_sb_info *sbi)
         struct curseg_info *array;
         int i;
 
-        array = f2fs_kzalloc(sbi, sizeof(*array) * NR_CURSEG_TYPE, GFP_KERNEL);
+        array = f2fs_kzalloc(sbi, array_size(NR_CURSEG_TYPE, sizeof(*array)),
+                             GFP_KERNEL);
         if (!array)
                 return -ENOMEM;
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index eac952271e45..3995e926ba3a 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2419,8 +2419,10 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi)
 
 #define F2FS_REPORT_NR_ZONES   4096
 
-        zones = f2fs_kzalloc(sbi, sizeof(struct blk_zone) *
-                                F2FS_REPORT_NR_ZONES, GFP_KERNEL);
+        zones = f2fs_kzalloc(sbi,
+                             array_size(F2FS_REPORT_NR_ZONES,
+                                        sizeof(struct blk_zone)),
+                             GFP_KERNEL);
         if (!zones)
                 return -ENOMEM;
 
@@ -2560,8 +2562,10 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
          * Initialize multiple devices information, or single
          * zoned block device information.
          */
-        sbi->devs = f2fs_kzalloc(sbi, sizeof(struct f2fs_dev_info) *
-                                                max_devices, GFP_KERNEL);
+        sbi->devs = f2fs_kzalloc(sbi,
+                                 array_size(max_devices,
+                                            sizeof(struct f2fs_dev_info)),
+                                 GFP_KERNEL);
         if (!sbi->devs)
                 return -ENOMEM;