aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-21 22:26:42 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-31 00:24:15 -0700
commit024cb8a67f3d3438322fac9d6f7b1cc578eca71c (patch)
tree23ba9dc417ae6a62aa3c9bbc2b07b0571ef28b6f /drivers/isdn/i4l
parent7d88950426da812a6ab93ee1bba821f7f0ec1766 (diff)
downloadkernel_samsung_aries-024cb8a67f3d3438322fac9d6f7b1cc578eca71c.zip
kernel_samsung_aries-024cb8a67f3d3438322fac9d6f7b1cc578eca71c.tar.gz
kernel_samsung_aries-024cb8a67f3d3438322fac9d6f7b1cc578eca71c.tar.bz2
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.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index f37b8f6..8c46bae 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)
/* uprog.len is unsigned short, so no overflow here */
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) {