summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-25 01:49:48 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-25 01:49:48 -0700
commit653252c2302cdf2dfbca66a7e177f7db783f9efa (patch)
tree8d77bebbe29378c818313e4557242548b923d787 /net/can
parentcc93d7d77d28d65d4f947dabc95a01c42d713ea3 (diff)
downloadop-kernel-dev-653252c2302cdf2dfbca66a7e177f7db783f9efa.zip
op-kernel-dev-653252c2302cdf2dfbca66a7e177f7db783f9efa.tar.gz
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')
-rw-r--r--net/can/raw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index ead50c7..201cbfc 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,
int fsize = ro->count * sizeof(struct can_filter);
if (len > fsize)
len = fsize;
- err = copy_to_user(optval, ro->filter, len);
+ if (copy_to_user(optval, ro->filter, len))
+ err = -EFAULT;
} else
len = 0;
release_sock(sk);
OpenPOWER on IntegriCloud