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/pcbit | |
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/pcbit')
-rw-r--r-- | drivers/isdn/pcbit/drv.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c index 123c1d6c43b4..1507d2e83fbb 100644 --- a/drivers/isdn/pcbit/drv.c +++ b/drivers/isdn/pcbit/drv.c | |||
@@ -411,14 +411,10 @@ static int pcbit_writecmd(const u_char __user *buf, int len, int driver, int cha | |||
411 | return -EINVAL; | 411 | return -EINVAL; |
412 | } | 412 | } |
413 | 413 | ||
414 | cbuf = kmalloc(len, GFP_KERNEL); | 414 | cbuf = memdup_user(buf, len); |
415 | if (!cbuf) | 415 | if (IS_ERR(cbuf)) |
416 | return -ENOMEM; | 416 | return PTR_ERR(cbuf); |
417 | 417 | ||
418 | if (copy_from_user(cbuf, buf, len)) { | ||
419 | kfree(cbuf); | ||
420 | return -EFAULT; | ||
421 | } | ||
422 | memcpy_toio(dev->sh_mem, cbuf, len); | 418 | memcpy_toio(dev->sh_mem, cbuf, len); |
423 | kfree(cbuf); | 419 | kfree(cbuf); |
424 | return len; | 420 | return len; |