---

yaml --- r: 93130 b: refs/heads/master c: 653252c h: refs/heads/master v: v3
git-mirror · Apr 25, 2008 · 43af5b3 · 43af5b3
1 parent 0a1216c
commit 43af5b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);