1 files changed, 3 insertions, 2 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 78a015fcec3b..925cf795a652 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3196,7 +3196,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
                 p->cluster_next = 1 + (prandom_u32() % p->highest_bit);
                 nr_cluster = DIV_ROUND_UP(maxpages, SWAPFILE_CLUSTER);
 
-                cluster_info = kvzalloc(nr_cluster * sizeof(*cluster_info),
+                cluster_info = kvcalloc(nr_cluster, sizeof(*cluster_info),
                                         GFP_KERNEL);
                 if (!cluster_info) {
                         error = -ENOMEM;
@@ -3233,7 +3233,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
         }
         /* frontswap enabled? set up bit-per-page map for frontswap */
         if (IS_ENABLED(CONFIG_FRONTSWAP))
-                frontswap_map = kvzalloc(BITS_TO_LONGS(maxpages) * sizeof(long),
+                frontswap_map = kvcalloc(BITS_TO_LONGS(maxpages),
+                                         sizeof(long),
                                          GFP_KERNEL);
 
         if (p->bdev &&(swap_flags & SWAP_FLAG_DISCARD) && swap_discardable(p)) {