projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cando' into for-linus
[linux-2.6-microblaze.git]
/
net
/
can
/
raw.c
diff --git
a/net/can/raw.c
b/net/can/raw.c
index
3a7dffb
..
da99cf1
100644
(file)
--- a/
net/can/raw.c
+++ b/
net/can/raw.c
@@
-445,7
+445,7
@@
static int raw_setsockopt(struct socket *sock, int level, int optname,
return -EFAULT;
}
} else if (count == 1) {
- if (copy_from_user(&sfilter, optval,
optlen
))
+ if (copy_from_user(&sfilter, optval,
sizeof(sfilter)
))
return -EFAULT;
}