diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-25 04:49:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-25 04:49:48 -0400 |
commit | 653252c2302cdf2dfbca66a7e177f7db783f9efa (patch) | |
tree | 8d77bebbe29378c818313e4557242548b923d787 /net/can/raw.c | |
parent | cc93d7d77d28d65d4f947dabc95a01c42d713ea3 (diff) |
net: Fix wrong interpretation of some copy_to_user() results.
I found some places, that erroneously return the value obtained from
the copy_to_user() call: if some amount of bytes were not able to get
to the user (this is what this one returns) the proper behavior is to
return the -EFAULT error, not that number itself.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can/raw.c')
-rw-r--r-- | net/can/raw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index ead50c7c0d40..201cbfc6b9ec 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
@@ -573,7 +573,8 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, | |||
573 | int fsize = ro->count * sizeof(struct can_filter); | 573 | int fsize = ro->count * sizeof(struct can_filter); |
574 | if (len > fsize) | 574 | if (len > fsize) |
575 | len = fsize; | 575 | len = fsize; |
576 | err = copy_to_user(optval, ro->filter, len); | 576 | if (copy_to_user(optval, ro->filter, len)) |
577 | err = -EFAULT; | ||
577 | } else | 578 | } else |
578 | len = 0; | 579 | len = 0; |
579 | release_sock(sk); | 580 | release_sock(sk); |