summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-08-20 19:03:37 -0400
committerBen Hutchings <ben@decadent.org.uk>2016-11-20 01:01:39 +0000
commit843b3708161cec9073aad1c7b7a09770fa552fec (patch)
tree41ec40cfb91c596576b503ac0ec019bd6864ea3f
parent6882b9a54f40f23f8b10f5b7df411cad3b52c5a7 (diff)
downloadlwn-843b3708161cec9073aad1c7b7a09770fa552fec.tar.gz
lwn-843b3708161cec9073aad1c7b7a09770fa552fec.zip
parisc: fix copy_from_user()
commit aace880feea38875fbc919761b77e5732a3659ef upstream. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--arch/parisc/include/asm/uaccess.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 337353de237b..a615403907a2 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -10,6 +10,8 @@
#include <asm/errno.h>
#include <asm-generic/uaccess-unaligned.h>
+#include <linux/string.h>
+
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -255,13 +257,14 @@ static inline unsigned long __must_check copy_from_user(void *to,
unsigned long n)
{
int sz = __compiletime_object_size(to);
- int ret = -EFAULT;
+ unsigned long ret = n;
if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
ret = __copy_from_user(to, from, n);
else
copy_from_user_overflow();
-
+ if (unlikely(ret))
+ memset(to + (n - ret), 0, ret);
return ret;
}