Prev: [PATCH 9/37] drivers/usb/gadget: Use kmemdup
Next: [PATCH 17/37] drivers/pci/hotplug: Use kmemdup
From: Julia Lawall on 15 May 2010 17:20
From: Julia Lawall <julia(a)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(a)diku.dk>

---
drivers/misc/iwmc3200top/log.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff -u -p a/drivers/misc/iwmc3200top/log.c b/drivers/misc/iwmc3200top/log.c
--- a/drivers/misc/iwmc3200top/log.c
+++ b/drivers/misc/iwmc3200top/log.c
@@ -214,7 +214,7 @@ ssize_t store_iwmct_log_level(struct dev
if (!count)
goto exit;

- str_buf = kzalloc(count, GFP_KERNEL);
+ str_buf = kmemdup(buf, count, GFP_KERNEL);
if (!str_buf) {
LOG_ERROR(priv, DEBUGFS,
"failed to allocate %zd bytes\n", count);
@@ -222,8 +222,6 @@ ssize_t store_iwmct_log_level(struct dev
goto exit;
}

- memcpy(str_buf, buf, count);
-
while ((token = strsep(&str_buf, ",")) != NULL) {
while (isspace(*token))
++token;
@@ -291,7 +289,7 @@ ssize_t store_iwmct_log_level_fw(struct
if (!count)
goto exit;

- str_buf = kzalloc(count, GFP_KERNEL);
+ str_buf = kmemdup(buf, count, GFP_KERNEL);
if (!str_buf) {
LOG_ERROR(priv, DEBUGFS,
"failed to allocate %zd bytes\n", count);
@@ -299,8 +297,6 @@ ssize_t store_iwmct_log_level_fw(struct
goto exit;
}

- memcpy(str_buf, buf, count);
-
cmd.hdr.type = COMM_TYPE_H2D;
cmd.hdr.category = COMM_CATEGORY_DEBUG;
cmd.hdr.opcode = CMD_DBG_LOG_LEVEL;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 9/37] drivers/usb/gadget: Use kmemdup
Next: [PATCH 17/37] drivers/pci/hotplug: Use kmemdup