diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-21 18:26:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-31 03:24:15 -0400 |
commit | 024cb8a67f3d3438322fac9d6f7b1cc578eca71c (patch) | |
tree | 23ba9dc417ae6a62aa3c9bbc2b07b0571ef28b6f /drivers/isdn/i4l | |
parent | 7d88950426da812a6ab93ee1bba821f7f0ec1766 (diff) |
drivers/isdn: 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/isdn/i4l')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index f37b8f68d0aa..8c46baee621b 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -449,14 +449,9 @@ static int get_filter(void __user *arg, struct sock_filter **p) | |||
449 | 449 | ||
450 | /* uprog.len is unsigned short, so no overflow here */ | 450 | /* uprog.len is unsigned short, so no overflow here */ |
451 | len = uprog.len * sizeof(struct sock_filter); | 451 | len = uprog.len * sizeof(struct sock_filter); |
452 | code = kmalloc(len, GFP_KERNEL); | 452 | code = memdup_user(uprog.filter, len); |
453 | if (code == NULL) | 453 | if (IS_ERR(code)) |
454 | return -ENOMEM; | 454 | return PTR_ERR(code); |
455 | |||
456 | if (copy_from_user(code, uprog.filter, len)) { | ||
457 | kfree(code); | ||
458 | return -EFAULT; | ||
459 | } | ||
460 | 455 | ||
461 | err = sk_chk_filter(code, uprog.len); | 456 | err = sk_chk_filter(code, uprog.len); |
462 | if (err) { | 457 | if (err) { |