All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH -next] module: use kmemdup rather than duplicating its implementation
@ 2016-07-13 12:49 weiyj_lk
  2016-07-18 20:37 ` Rusty Russell
  0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2016-07-13 12:49 UTC (permalink / raw)
  To: Rusty Russell; +Cc: Wei Yongjun, linux-kernel

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Use kmemdup rather than duplicating its implementation.

Generated by: scripts/coccinelle/api/memdup.cocci

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 kernel/module.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index beaebea..04de59f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1994,21 +1994,20 @@ static int copy_module_elf(struct module *mod, struct load_info *info)
 
 	/* Elf section header table */
 	size = sizeof(*info->sechdrs) * info->hdr->e_shnum;
-	mod->klp_info->sechdrs = kmalloc(size, GFP_KERNEL);
+	mod->klp_info->sechdrs = kmemdup(info->sechdrs, size, GFP_KERNEL);
 	if (mod->klp_info->sechdrs == NULL) {
 		ret = -ENOMEM;
 		goto free_info;
 	}
-	memcpy(mod->klp_info->sechdrs, info->sechdrs, size);
 
 	/* Elf section name string table */
 	size = info->sechdrs[info->hdr->e_shstrndx].sh_size;
-	mod->klp_info->secstrings = kmalloc(size, GFP_KERNEL);
+	mod->klp_info->secstrings = kmemdup(info->secstrings, size,
+					    GFP_KERNEL);
 	if (mod->klp_info->secstrings == NULL) {
 		ret = -ENOMEM;
 		goto free_sechdrs;
 	}
-	memcpy(mod->klp_info->secstrings, info->secstrings, size);
 
 	/* Elf symbol section index */
 	symndx = info->index.sym;

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] module: use kmemdup rather than duplicating its implementation
  2016-07-13 12:49 [PATCH -next] module: use kmemdup rather than duplicating its implementation weiyj_lk
@ 2016-07-18 20:37 ` Rusty Russell
  0 siblings, 0 replies; 2+ messages in thread
From: Rusty Russell @ 2016-07-18 20:37 UTC (permalink / raw)
  To: weiyj_lk; +Cc: Wei Yongjun, linux-kernel

weiyj_lk@163.com writes:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Use kmemdup rather than duplicating its implementation.
>
> Generated by: scripts/coccinelle/api/memdup.cocci
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Hi Wei!

        This code has been removed by other changes in modules-next,
so your very nice cleanup is no longer necessary.

Thanks!
Rusty.

> ---
>  kernel/module.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/module.c b/kernel/module.c
> index beaebea..04de59f 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -1994,21 +1994,20 @@ static int copy_module_elf(struct module *mod, struct load_info *info)
>  
>  	/* Elf section header table */
>  	size = sizeof(*info->sechdrs) * info->hdr->e_shnum;
> -	mod->klp_info->sechdrs = kmalloc(size, GFP_KERNEL);
> +	mod->klp_info->sechdrs = kmemdup(info->sechdrs, size, GFP_KERNEL);
>  	if (mod->klp_info->sechdrs == NULL) {
>  		ret = -ENOMEM;
>  		goto free_info;
>  	}
> -	memcpy(mod->klp_info->sechdrs, info->sechdrs, size);
>  
>  	/* Elf section name string table */
>  	size = info->sechdrs[info->hdr->e_shstrndx].sh_size;
> -	mod->klp_info->secstrings = kmalloc(size, GFP_KERNEL);
> +	mod->klp_info->secstrings = kmemdup(info->secstrings, size,
> +					    GFP_KERNEL);
>  	if (mod->klp_info->secstrings == NULL) {
>  		ret = -ENOMEM;
>  		goto free_sechdrs;
>  	}
> -	memcpy(mod->klp_info->secstrings, info->secstrings, size);
>  
>  	/* Elf symbol section index */
>  	symndx = info->index.sym;

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-07-18 23:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-13 12:49 [PATCH -next] module: use kmemdup rather than duplicating its implementation weiyj_lk
2016-07-18 20:37 ` Rusty Russell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.