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/tipc | |
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/tipc')
-rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 05853159536..230f9ca2ad6 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -1756,8 +1756,8 @@ static int getsockopt(struct socket *sock, | |||
1756 | else if (len < sizeof(value)) { | 1756 | else if (len < sizeof(value)) { |
1757 | res = -EINVAL; | 1757 | res = -EINVAL; |
1758 | } | 1758 | } |
1759 | else if ((res = copy_to_user(ov, &value, sizeof(value)))) { | 1759 | else if (copy_to_user(ov, &value, sizeof(value))) { |
1760 | /* couldn't return value */ | 1760 | res = -EFAULT; |
1761 | } | 1761 | } |
1762 | else { | 1762 | else { |
1763 | res = put_user(sizeof(value), ol); | 1763 | res = put_user(sizeof(value), ol); |