diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-15 07:20:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-17 20:44:47 -0400 |
commit | 99bf236612801351834b441314379bc5304d62ce (patch) | |
tree | 56922d148dedd5d6fc19e6da0629d6f2dfcec007 /drivers/net/usb | |
parent | 175c04414106c34f0130d8d3bf152825b4829ceb (diff) |
drivers/net/usb: 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/asix.c | 3 | ||||
-rw-r--r-- | drivers/net/usb/mcs7830.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 66c5e89326c1..31b73310ec77 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
@@ -224,10 +224,9 @@ static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, | |||
224 | cmd, value, index, size); | 224 | cmd, value, index, size); |
225 | 225 | ||
226 | if (data) { | 226 | if (data) { |
227 | buf = kmalloc(size, GFP_KERNEL); | 227 | buf = kmemdup(data, size, GFP_KERNEL); |
228 | if (!buf) | 228 | if (!buf) |
229 | goto out; | 229 | goto out; |
230 | memcpy(buf, data, size); | ||
231 | } | 230 | } |
232 | 231 | ||
233 | err = usb_control_msg( | 232 | err = usb_control_msg( |
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 834d8cd3005d..a6281e3987b5 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -142,12 +142,10 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, const void * | |||
142 | int ret; | 142 | int ret; |
143 | void *buffer; | 143 | void *buffer; |
144 | 144 | ||
145 | buffer = kmalloc(size, GFP_NOIO); | 145 | buffer = kmemdup(data, size, GFP_NOIO); |
146 | if (buffer == NULL) | 146 | if (buffer == NULL) |
147 | return -ENOMEM; | 147 | return -ENOMEM; |
148 | 148 | ||
149 | memcpy(buffer, data, size); | ||
150 | |||
151 | ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ, | 149 | ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ, |
152 | MCS7830_WR_BMREQ, 0x0000, index, buffer, | 150 | MCS7830_WR_BMREQ, 0x0000, index, buffer, |
153 | size, MCS7830_CTRL_TIMEOUT); | 151 | size, MCS7830_CTRL_TIMEOUT); |