diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-15 17:24:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-02 16:13:13 -0400 |
commit | 1d66fa777d674da3a5172dcdd930f8928b1904c6 (patch) | |
tree | de37da1e15c1a72d0b5140fd1c7695ce2a792135 | |
parent | 27b81bbed881ae93e8c23c216129cdeee86d4051 (diff) |
drivers/net/wireless/orinoco: 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>
-rw-r--r-- | drivers/net/wireless/orinoco/wext.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index 5775124e2aee..a63108c6df7d 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c | |||
@@ -993,11 +993,9 @@ static int orinoco_ioctl_set_genie(struct net_device *dev, | |||
993 | return -EINVAL; | 993 | return -EINVAL; |
994 | 994 | ||
995 | if (wrqu->data.length) { | 995 | if (wrqu->data.length) { |
996 | buf = kmalloc(wrqu->data.length, GFP_KERNEL); | 996 | buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL); |
997 | if (buf == NULL) | 997 | if (buf == NULL) |
998 | return -ENOMEM; | 998 | return -ENOMEM; |
999 | |||
1000 | memcpy(buf, extra, wrqu->data.length); | ||
1001 | } else | 999 | } else |
1002 | buf = NULL; | 1000 | buf = NULL; |
1003 | 1001 | ||