summaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-25 01:49:48 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-01 14:44:32 -0700
commitdc2ee1a436bee6ada5afeedb62dc015ed5553f3d (patch)
tree40564ab300c5b428993c65fa044965bd8ffe285e /net/can
parent75e109ad447b0bded3f0e2b2def52bce4fa9a1ea (diff)
net: Fix wrong interpretation of some copy_to_user() results.
[ Upstream commit: 653252c2302cdf2dfbca66a7e177f7db783f9efa ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 94cd7f27c444..c92cb8e48a23 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);