summaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-21 22:18:34 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-31 00:24:11 -0700
commit16dff91804777efbb0ce18b0a7e54c55e86b7beb (patch)
treef32f5a6258ca45284c8a12d83ac08e5d892c9e13 /net/can
parentd7fd1b5747fff3bde92777bcaf705d98ae6f8b6f (diff)
downloadlinux-3.10-16dff91804777efbb0ce18b0a7e54c55e86b7beb.tar.gz
linux-3.10-16dff91804777efbb0ce18b0a7e54c55e86b7beb.tar.bz2
linux-3.10-16dff91804777efbb0ce18b0a7e54c55e86b7beb.zip
net/can: 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 'net/can')
-rw-r--r--net/can/raw.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index da99cf153b3..ccfe633eec8 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -436,14 +436,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
if (count > 1) {
/* filter does not fit into dfilter => alloc space */
- filter = kmalloc(optlen, GFP_KERNEL);
- if (!filter)
- return -ENOMEM;
-
- if (copy_from_user(filter, optval, optlen)) {
- kfree(filter);
- return -EFAULT;
- }
+ filter = memdup_user(optval, optlen);
+ if (IS_ERR(filter))
+ return PTR_ERR(filter);
} else if (count == 1) {
if (copy_from_user(&sfilter, optval, sizeof(sfilter)))
return -EFAULT;