diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-14 05:01:33 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-14 05:01:33 -0700 |
commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /net | |
parent | 1253332f75f3774cc84d0b7693152656848901f9 (diff) | |
parent | 0110d6f22f392f976e84ab49da1b42f85b64a3c5 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
Diffstat (limited to 'net')
-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; } |