diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-20 11:57:38 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-20 11:57:38 +0900 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /net/can/raw.c | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 3a7dffb6519c..da99cf153b33 100644 --- 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; } |