Skip to contentSkip to conversation

NFS: Fix use of copy_to_user() in idmap_pipe_upcall

PATCH In review Chuck Lever 1 participant 1 message Dec 20, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/8 NFS: Fix use of copy_to_user() in idmap_pipe_upcall

The idmap_pipe_upcall() function expects the copy_to_user() function to return a negative error value if the call fails, but copy_to_user() returns an unsigned long number of bytes that couldn't be copied.

---

 fs/nfs/idmap.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
fs/nfs/idmap.c +6 -8
index c56fc7d..d93e071 100644
@@ -358,17 +358,15 @@ idmap_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
 		  char __user *dst, size_t buflen)
 {
 	char *data = (char *)msg->data + msg->copied;
-	ssize_t mlen = msg->len - msg->copied;
-	ssize_t left;
-
-	if (mlen > buflen)
-		mlen = buflen;
+	size_t mlen = min(msg->len, buflen);
+	unsigned long left;
 
 	left = copy_to_user(dst, data, mlen);
-	if (left < 0) {
-		msg->errno = left;
-		return left;
+	if (left == mlen) {
+		msg->errno = -EFAULT;
+		return -EFAULT;
 	}
+
 	mlen -= left;
 	msg->copied += mlen;
 	msg->errno = 0;