diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-21 18:20:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-31 03:24:13 -0400 |
commit | c5dc9a3581f486a738f82a5317229d494d0f475f (patch) | |
tree | 4a36dbc8c3edaa6e3be6d73484722c53793c0ed2 /drivers/net/cxgb3 | |
parent | b23d00e9212d04eb894dd29422c7a53b36b8e32d (diff) |
drivers/net/cxgb3: Use memdup_user
Use memdup_user when user data is immediately copied into the
allocated region.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression from,to,size,flag;
position p;
identifier l1,l2;
@@
- to = \(kmalloc@p\|kzalloc@p\)(size,flag);
+ to = memdup_user(from,size);
if (
- to==NULL
+ IS_ERR(to)
|| ...) {
<+... when != goto l1;
- -ENOMEM
+ PTR_ERR(to)
...+>
}
- if (copy_from_user(to, from, size) != 0) {
- <+... when != goto l2;
- -EFAULT
- ...+>
- }
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index e3f1b8566495..066fd5b09fda 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -2311,15 +2311,9 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) | |||
2311 | if (copy_from_user(&t, useraddr, sizeof(t))) | 2311 | if (copy_from_user(&t, useraddr, sizeof(t))) |
2312 | return -EFAULT; | 2312 | return -EFAULT; |
2313 | /* Check t.len sanity ? */ | 2313 | /* Check t.len sanity ? */ |
2314 | fw_data = kmalloc(t.len, GFP_KERNEL); | 2314 | fw_data = memdup_user(useraddr + sizeof(t), t.len); |
2315 | if (!fw_data) | 2315 | if (IS_ERR(fw_data)) |
2316 | return -ENOMEM; | 2316 | return PTR_ERR(fw_data); |
2317 | |||
2318 | if (copy_from_user | ||
2319 | (fw_data, useraddr + sizeof(t), t.len)) { | ||
2320 | kfree(fw_data); | ||
2321 | return -EFAULT; | ||
2322 | } | ||
2323 | 2317 | ||
2324 | ret = t3_load_fw(adapter, fw_data, t.len); | 2318 | ret = t3_load_fw(adapter, fw_data, t.len); |
2325 | kfree(fw_data); | 2319 | kfree(fw_data); |