Use vzalloc() instead of vmalloc() and memset(0) to simpify the code.
Signed-off-by: Yang Yingliang <[email protected]>
---
kernel/module/main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/module/main.c b/kernel/module/main.c
index fed58d30725d..02b67abc448f 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -2138,7 +2138,7 @@ static int move_module(struct module *mod, struct load_info *info)
#ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC
/* Do the allocs. */
- ptr = vmalloc(mod->data_layout.size);
+ ptr = vzalloc(mod->data_layout.size);
/*
* The pointer to this block is stored in the module structure
* which is inside the block. Just mark it as not being a
@@ -2151,7 +2151,6 @@ static int move_module(struct module *mod, struct load_info *info)
return -ENOMEM;
}
- memset(ptr, 0, mod->data_layout.size);
mod->data_layout.base = ptr;
#endif
/* Transfer each section which specifies SHF_ALLOC */
--
2.25.1
On Mon 2022-07-04 20:03 +0800, Yang Yingliang wrote:
> Use vzalloc() instead of vmalloc() and memset(0) to simpify the code.
>
> Signed-off-by: Yang Yingliang <[email protected]>
> ---
> kernel/module/main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/kernel/module/main.c b/kernel/module/main.c
> index fed58d30725d..02b67abc448f 100644
> --- a/kernel/module/main.c
> +++ b/kernel/module/main.c
> @@ -2138,7 +2138,7 @@ static int move_module(struct module *mod, struct load_info *info)
>
> #ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC
> /* Do the allocs. */
> - ptr = vmalloc(mod->data_layout.size);
> + ptr = vzalloc(mod->data_layout.size);
> /*
> * The pointer to this block is stored in the module structure
> * which is inside the block. Just mark it as not being a
> @@ -2151,7 +2151,6 @@ static int move_module(struct module *mod, struct load_info *info)
> return -ENOMEM;
> }
>
> - memset(ptr, 0, mod->data_layout.size);
> mod->data_layout.base = ptr;
> #endif
> /* Transfer each section which specifies SHF_ALLOC */
> --
> 2.25.1
>
Hi Yang,
Nice!
Reviewed-by: Aaron Tomlin <[email protected]>
Kind regards,
--
Aaron Tomlin
On Mon, Jul 04, 2022 at 08:03:37PM +0800, Yang Yingliang wrote:
> Use vzalloc() instead of vmalloc() and memset(0) to simpify the code.
>
> Signed-off-by: Yang Yingliang <[email protected]>
Thanks! Queued onto modules-next.
Luis