Skip to contentSkip to conversation

i2o/memory.c : Use kstrdup

PATCH In review Himangi Saraogi 2 participants 2 messages Jun 10, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2o/memory.c : Use kstrdup

Use kstrdup when the goal of an allocation is copy a string into the allocated region.

The Coccinelle semantic patch that makes this change is as follows:

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

- to = kmalloc(strlen(from) + 1,flag);
+ to = kstrdup(from, flag);
... when != \(from = E1 \| to = E1 \)
if (to==NULL || ...) S
... when != \(from = E2 \| to = E2 \)
- strcpy(to, from);
// </smpl>

---
To send to: [email protected]

 drivers/message/i2o/memory.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/message/i2o/memory.c +1 -2
index 292b41e..1741a59 100644
@@ -270,10 +270,9 @@ EXPORT_SYMBOL_GPL(i2o_dma_realloc);
 int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
 				 size_t size, int min_nr)
 {
-	pool->name = kmalloc(strlen(name) + 1, GFP_KERNEL);
+	pool->name = kstrdup(name, GFP_KERNEL);
 	if (!pool->name)
 		goto exit;
-	strcpy(pool->name, name);
 
 	pool->slab =
 	    kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL);
Signature · 1 line
1.9.1
#1 lore raw
Quoted 20 lines · Himangi Saraogi

Use kstrdup when the goal of an allocation is copy a string into the allocated region.

The Coccinelle semantic patch that makes this change is as follows:

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

(quoted diff) +1 -2
-  to = kmalloc(strlen(from) + 1,flag);
+  to = kstrdup(from, flag);
   ... when != \(from = E1 \| to = E1 \)
   if (to==NULL || ...) S
   ... when != \(from = E2 \| to = E2 \)
-  strcpy(to, from);

// </smpl>

Quoted 5 lines

---
To send to: [email protected]

 drivers/message/i2o/memory.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

I no longer have any I2O hardware so I'm unable to test this. Looks right but does anyone actually still use these drivers ????

Alan