Patchwork [19/37] drivers/net/usb: Use kmemdup

login
register
mail settings
Submitter Julia Lawall
Date May 15, 2010, 9:18 p.m.
Message ID <Pine.LNX.4.64.1005152318410.21345@ask.diku.dk>
Download mbox | patch
Permalink /patch/52730/
State Accepted
Delegated to: David Miller
Headers show

Comments

Julia Lawall - May 15, 2010, 9:18 p.m.
From: Julia Lawall <julia@diku.dk>

Use kmemdup when some other buffer is immediately copied into the
allocated region.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to,size,flag;
statement S;
@@

-  to = \(kmalloc\|kzalloc\)(size,flag);
+  to = kmemdup(from,size,flag);
   if (to==NULL || ...) S
-  memcpy(to, from, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/net/usb/pegasus.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Petko Manolov - May 19, 2010, 8:07 a.m.
Looks all right to me.


 		Petko


On Sat, 15 May 2010, Julia Lawall wrote:

> From: Julia Lawall <julia@diku.dk>
>
> Use kmemdup when some other buffer is immediately copied into the
> allocated region.
>
> A simplified version of the semantic patch that makes this change is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression from,to,size,flag;
> statement S;
> @@
>
> -  to = \(kmalloc\|kzalloc\)(size,flag);
> +  to = kmemdup(from,size,flag);
>   if (to==NULL || ...) S
> -  memcpy(to, from, size);
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> drivers/net/usb/pegasus.c |    6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff -u -p a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
> --- a/drivers/net/usb/pegasus.c
> +++ b/drivers/net/usb/pegasus.c
> @@ -203,13 +203,12 @@ static int set_registers(pegasus_t * peg
> 	char *buffer;
> 	DECLARE_WAITQUEUE(wait, current);
>
> -	buffer = kmalloc(size, GFP_KERNEL);
> +	buffer = kmemdup(data, size, GFP_KERNEL);
> 	if (!buffer) {
> 		netif_warn(pegasus, drv, pegasus->net,
> 			   "out of memory in %s\n", __func__);
> 		return -ENOMEM;
> 	}
> -	memcpy(buffer, data, size);
>
> 	add_wait_queue(&pegasus->ctrl_wait, &wait);
> 	set_current_state(TASK_UNINTERRUPTIBLE);
> @@ -255,13 +254,12 @@ static int set_register(pegasus_t * pega
> 	char *tmp;
> 	DECLARE_WAITQUEUE(wait, current);
>
> -	tmp = kmalloc(1, GFP_KERNEL);
> +	tmp = kmemdup(&data, 1, GFP_KERNEL);
> 	if (!tmp) {
> 		netif_warn(pegasus, drv, pegasus->net,
> 			   "out of memory in %s\n", __func__);
> 		return -ENOMEM;
> 	}
> -	memcpy(tmp, &data, 1);
> 	add_wait_queue(&pegasus->ctrl_wait, &wait);
> 	set_current_state(TASK_UNINTERRUPTIBLE);
> 	while (pegasus->flags & ETH_REGS_CHANGED)
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -u -p a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -203,13 +203,12 @@  static int set_registers(pegasus_t * peg
 	char *buffer;
 	DECLARE_WAITQUEUE(wait, current);
 
-	buffer = kmalloc(size, GFP_KERNEL);
+	buffer = kmemdup(data, size, GFP_KERNEL);
 	if (!buffer) {
 		netif_warn(pegasus, drv, pegasus->net,
 			   "out of memory in %s\n", __func__);
 		return -ENOMEM;
 	}
-	memcpy(buffer, data, size);
 
 	add_wait_queue(&pegasus->ctrl_wait, &wait);
 	set_current_state(TASK_UNINTERRUPTIBLE);
@@ -255,13 +254,12 @@  static int set_register(pegasus_t * pega
 	char *tmp;
 	DECLARE_WAITQUEUE(wait, current);
 
-	tmp = kmalloc(1, GFP_KERNEL);
+	tmp = kmemdup(&data, 1, GFP_KERNEL);
 	if (!tmp) {
 		netif_warn(pegasus, drv, pegasus->net,
 			   "out of memory in %s\n", __func__);
 		return -ENOMEM;
 	}
-	memcpy(tmp, &data, 1);
 	add_wait_queue(&pegasus->ctrl_wait, &wait);
 	set_current_state(TASK_UNINTERRUPTIBLE);
 	while (pegasus->flags & ETH_REGS_CHANGED)