drivers/net/wireless/p54: Use kmemdup

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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 187e263b045ae813dae3fb59a7c0b27b9d85c4fe..e51650ed49f2ebf0d479785df6aa8071c22ee9bd 100644 (file)
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -599,13 +599,13 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                        }
                        break;
                case PDR_PRISM_ZIF_TX_IQ_CALIBRATION:
-                       priv->iq_autocal = kmalloc(data_len, GFP_KERNEL);
+                       priv->iq_autocal = kmemdup(entry->data, data_len,
+                                                  GFP_KERNEL);
                        if (!priv->iq_autocal) {
                                err = -ENOMEM;
                                goto err;
                        }
 
-                       memcpy(priv->iq_autocal, entry->data, data_len);
                        priv->iq_autocal_len = data_len / sizeof(struct pda_iq_autocal_entry);
                        break;
                case PDR_DEFAULT_COUNTRY:

diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index d5b197b4d5bb492ac70c8e2a98297a2e82e5e356..a068621307036b0a2415123549c2be01b5c381e2 100644 (file)
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -433,10 +433,9 @@ static int p54u_firmware_reset_3887(struct ieee80211_hw *dev)
        u8 *buf;
        int ret;
 
-       buf = kmalloc(4, GFP_KERNEL);
+       buf = kmemdup(p54u_romboot_3887, 4, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
-       memcpy(buf, p54u_romboot_3887, 4);
        ret = p54u_bulk_msg(priv, P54U_PIPE_DATA,
                            buf, 4);
        kfree(buf);