diff options
| author | Julia Lawall <julia@diku.dk> | 2010-05-21 22:18:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 00:24:12 -0700 |
| commit | b23d00e9212d04eb894dd29422c7a53b36b8e32d (patch) | |
| tree | 99b6a6f7e57edfc1b3f3ec5c70a02ba7e3de7573 | |
| parent | 16dff91804777efbb0ce18b0a7e54c55e86b7beb (diff) | |
| download | linux-3.10-b23d00e9212d04eb894dd29422c7a53b36b8e32d.tar.gz linux-3.10-b23d00e9212d04eb894dd29422c7a53b36b8e32d.tar.bz2 linux-3.10-b23d00e9212d04eb894dd29422c7a53b36b8e32d.zip | |
drivers/net: 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>
| -rw-r--r-- | drivers/net/ppp_generic.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 144375dea2d..0db38946bc0 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -538,14 +538,9 @@ static int get_filter(void __user *arg, struct sock_filter **p) } len = uprog.len * sizeof(struct sock_filter); - code = kmalloc(len, GFP_KERNEL); - if (code == NULL) - return -ENOMEM; - - if (copy_from_user(code, uprog.filter, len)) { - kfree(code); - return -EFAULT; - } + code = memdup_user(uprog.filter, len); + if (IS_ERR(code)) + return PTR_ERR(code); err = sk_chk_filter(code, uprog.len); if (err) { |