From 43af5b37c410cbd6f93402203a70ea8a269825e9 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 25 Apr 2008 01:49:48 -0700
Subject: [PATCH] --- yaml --- r: 93130 b: refs/heads/master c:
 653252c2302cdf2dfbca66a7e177f7db783f9efa h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/can/raw.c     | 3 ++-
 trunk/net/dccp/probe.c  | 2 +-
 trunk/net/tipc/socket.c | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 864f68e915a0..5dc24e52b298 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc93d7d77d28d65d4f947dabc95a01c42d713ea3
+refs/heads/master: 653252c2302cdf2dfbca66a7e177f7db783f9efa
diff --git a/trunk/net/can/raw.c b/trunk/net/can/raw.c
index ead50c7c0d40..201cbfc6b9ec 100644
--- a/trunk/net/can/raw.c
+++ b/trunk/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);
diff --git a/trunk/net/dccp/probe.c b/trunk/net/dccp/probe.c
index 6e1df62bd7c9..0bcdc9250279 100644
--- a/trunk/net/dccp/probe.c
+++ b/trunk/net/dccp/probe.c
@@ -140,7 +140,7 @@ static ssize_t dccpprobe_read(struct file *file, char __user *buf,
 		goto out_free;
 
 	cnt = kfifo_get(dccpw.fifo, tbuf, len);
-	error = copy_to_user(buf, tbuf, cnt);
+	error = copy_to_user(buf, tbuf, cnt) ? -EFAULT : 0;
 
 out_free:
 	vfree(tbuf);
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index 05853159536a..230f9ca2ad6b 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/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);