]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Bluetooth: Use kmemdup for drivers
authorJulia Lawall <julia@diku.dk>
Sat, 15 May 2010 21:19:15 +0000 (23:19 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 21 Jul 2010 17:39:06 +0000 (10:39 -0700)
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>
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/bcm203x.c

index b0c84c19f442e3ad41fc7340b50e33366c75adcd..8b1b643a519b330a8119ad5bde789ec105edfdfc 100644 (file)
@@ -224,7 +224,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
 
        BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
 
-       data->fw_data = kmalloc(firmware->size, GFP_KERNEL);
+       data->fw_data = kmemdup(firmware->data, firmware->size, GFP_KERNEL);
        if (!data->fw_data) {
                BT_ERR("Can't allocate memory for firmware image");
                release_firmware(firmware);
@@ -234,7 +234,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
                return -ENOMEM;
        }
 
-       memcpy(data->fw_data, firmware->data, firmware->size);
        data->fw_size = firmware->size;
        data->fw_sent = 0;