X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=net%2Ftipc%2Fsocket.c;h=230f9ca2ad6b361dd4e78e6a2f1247334e9b9d22;hb=c203e45f069af47ca7623e4dcd8c00bfba2722e4;hp=05853159536a03b984708c400808dcf6e26fcb77;hpb=f838bad1b3be8ca0c785ee0e0c570dfda74cf377;p=linux-2.6

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 0585315953..230f9ca2ad 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);