]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drivers/platform/x86: Use kmemdup
authorJulia Lawall <julia@diku.dk>
Sat, 15 May 2010 21:22:18 +0000 (23:22 +0200)
committerMatthew Garrett <mjg@redhat.com>
Thu, 20 May 2010 13:26:13 +0000 (09:26 -0400)
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/platform/x86/wmi.c

index 39ec5b6c2e3a804518bdad78257bb766812e3274..17df134a6f0362deea95d8d8bd1cc5f4c3086df5 100644 (file)
@@ -756,12 +756,10 @@ static __init acpi_status parse_wdg(acpi_handle handle)
 
        total = obj->buffer.length / sizeof(struct guid_block);
 
-       gblock = kzalloc(obj->buffer.length, GFP_KERNEL);
+       gblock = kmemdup(obj->buffer.pointer, obj->buffer.length, GFP_KERNEL);
        if (!gblock)
                return AE_NO_MEMORY;
 
-       memcpy(gblock, obj->buffer.pointer, obj->buffer.length);
-
        for (i = 0; i < total; i++) {
                /*
                  Some WMI devices, like those for nVidia hooks, have a