summaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-25 10:49:48 +0200
committerDavid S. Miller <davem@davemloft.net>2008-04-25 10:49:48 +0200
commit653252c2302cdf2dfbca66a7e177f7db783f9efa (patch)
tree8d77bebbe29378c818313e4557242548b923d787 /net/tipc/socket.c
parentMerge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
downloadlinux-653252c2302cdf2dfbca66a7e177f7db783f9efa.tar.xz
linux-653252c2302cdf2dfbca66a7e177f7db783f9efa.zip
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 '')
-rw-r--r--net/tipc/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 05853159536a..230f9ca2ad6b 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1756,8 +1756,8 @@ static int getsockopt(struct socket *sock,
else if (len < sizeof(value)) {
res = -EINVAL;
}
- else if ((res = copy_to_user(ov, &value, sizeof(value)))) {
- /* couldn't return value */
+ else if (copy_to_user(ov, &value, sizeof(value))) {
+ res = -EFAULT;
}
else {
res = put_user(sizeof(value), ol);