From 10b5b538ec67d6350c568650bd780d070d082c3c Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 20 Dec 2007 14:54:27 -0500
Subject: [PATCH] --- yaml --- r: 79653 b: refs/heads/master c:
 7df089952fca41cb336733e1167c0a25e5a025d8 h: refs/heads/master i:   79651:
 82bf57a55380a5d37ab761dcefd031b47b9473e8 v: v3

---
 [refs]                               |  2 +-
 trunk/net/sunrpc/auth_gss/auth_gss.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e1a7781fd640..5ebbc9bd247c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59dca3b28cb915745019d4f4c27d97b6b6ab12c6
+refs/heads/master: 7df089952fca41cb336733e1167c0a25e5a025d8
diff --git a/trunk/net/sunrpc/auth_gss/auth_gss.c b/trunk/net/sunrpc/auth_gss/auth_gss.c
index 1f2d85e869c0..6dac38792288 100644
--- a/trunk/net/sunrpc/auth_gss/auth_gss.c
+++ b/trunk/net/sunrpc/auth_gss/auth_gss.c
@@ -472,16 +472,15 @@ gss_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;
-	ssize_t left;
+	size_t mlen = min(msg->len, buflen);
+	unsigned long left;
 
-	if (mlen > buflen)
-		mlen = buflen;
 	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;