diff options
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/swap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 1efcb5b0c3ed..c2bcf97d24c8 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
@@ -698,7 +698,7 @@ static int save_image_lzo(struct swap_map_handle *handle, | |||
698 | goto out_clean; | 698 | goto out_clean; |
699 | } | 699 | } |
700 | 700 | ||
701 | data = vmalloc(sizeof(*data) * nr_threads); | 701 | data = vmalloc(array_size(nr_threads, sizeof(*data))); |
702 | if (!data) { | 702 | if (!data) { |
703 | pr_err("Failed to allocate LZO data\n"); | 703 | pr_err("Failed to allocate LZO data\n"); |
704 | ret = -ENOMEM; | 704 | ret = -ENOMEM; |
@@ -1183,14 +1183,14 @@ static int load_image_lzo(struct swap_map_handle *handle, | |||
1183 | nr_threads = num_online_cpus() - 1; | 1183 | nr_threads = num_online_cpus() - 1; |
1184 | nr_threads = clamp_val(nr_threads, 1, LZO_THREADS); | 1184 | nr_threads = clamp_val(nr_threads, 1, LZO_THREADS); |
1185 | 1185 | ||
1186 | page = vmalloc(sizeof(*page) * LZO_MAX_RD_PAGES); | 1186 | page = vmalloc(array_size(LZO_MAX_RD_PAGES, sizeof(*page))); |
1187 | if (!page) { | 1187 | if (!page) { |
1188 | pr_err("Failed to allocate LZO page\n"); | 1188 | pr_err("Failed to allocate LZO page\n"); |
1189 | ret = -ENOMEM; | 1189 | ret = -ENOMEM; |
1190 | goto out_clean; | 1190 | goto out_clean; |
1191 | } | 1191 | } |
1192 | 1192 | ||
1193 | data = vmalloc(sizeof(*data) * nr_threads); | 1193 | data = vmalloc(array_size(nr_threads, sizeof(*data))); |
1194 | if (!data) { | 1194 | if (!data) { |
1195 | pr_err("Failed to allocate LZO data\n"); | 1195 | pr_err("Failed to allocate LZO data\n"); |
1196 | ret = -ENOMEM; | 1196 | ret = -ENOMEM; |