X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Fnios2%2Finclude%2Fasm%2Fuaccess.h;h=2b4b9e91967525b722990ba4796324be523a1f9d;hb=e33d1f6f72cc82fcfc3d1fb20c9e3ad83b1928fa;hp=caa51ff85a3c7d0ac7c57cf034758185aad64724;hpb=dd7c2e720a16958da1279a8d69de6fb14b6f4ee4;p=linux-2.6-block.git

diff --git a/arch/nios2/include/asm/uaccess.h b/arch/nios2/include/asm/uaccess.h
index caa51ff85a3c..2b4b9e919675 100644
--- a/arch/nios2/include/asm/uaccess.h
+++ b/arch/nios2/include/asm/uaccess.h
@@ -102,9 +102,12 @@ extern long __copy_to_user(void __user *to, const void *from, unsigned long n);
 static inline long copy_from_user(void *to, const void __user *from,
 				unsigned long n)
 {
-	if (!access_ok(VERIFY_READ, from, n))
-		return n;
-	return __copy_from_user(to, from, n);
+	unsigned long res = n;
+	if (access_ok(VERIFY_READ, from, n))
+		res = __copy_from_user(to, from, n);
+	if (unlikely(res))
+		memset(to + (n - res), 0, res);
+	return res;
 }
 
 static inline long copy_to_user(void __user *to, const void *from,