Skip to content

Commit 68e8555

Browse files
keessamitolvanen
authored andcommitted
module/decompress: Avoid open-coded kvrealloc()
Replace open-coded allocate/copy with kvrealloc(). Signed-off-by: Kees Cook <kees@kernel.org> Reviewed-by: Petr Pavlu <petr.pavlu@suse.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
1 parent ddc54f9 commit 68e8555

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

kernel/module/decompress.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
static int module_extend_max_pages(struct load_info *info, unsigned int extent)
1818
{
1919
struct page **new_pages;
20+
unsigned int new_max = info->max_pages + extent;
2021

21-
new_pages = kvmalloc_array(info->max_pages + extent,
22-
sizeof(info->pages), GFP_KERNEL);
22+
new_pages = kvrealloc(info->pages,
23+
size_mul(new_max, sizeof(*info->pages)),
24+
GFP_KERNEL);
2325
if (!new_pages)
2426
return -ENOMEM;
2527

26-
memcpy(new_pages, info->pages, info->max_pages * sizeof(info->pages));
27-
kvfree(info->pages);
2828
info->pages = new_pages;
29-
info->max_pages += extent;
29+
info->max_pages = new_max;
3030

3131
return 0;
3232
}

0 commit comments

Comments
 (0)