aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/uaccess.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-08-20 19:03:37 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-09-13 17:49:44 -0400
commitaace880feea38875fbc919761b77e5732a3659ef (patch)
tree90659c81f82e944ffdaff5978dcdaee83c962b48 /arch/parisc/include/asm/uaccess.h
parentopenrisc: fix copy_from_user() (diff)
downloadlinux-dev-aace880feea38875fbc919761b77e5732a3659ef.tar.xz
linux-dev-aace880feea38875fbc919761b77e5732a3659ef.zip
parisc: fix copy_from_user()
Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
-rw-r--r--arch/parisc/include/asm/uaccess.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 0f59fd9ca205..37a1bee96444 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -10,6 +10,7 @@
#include <asm-generic/uaccess-unaligned.h>
#include <linux/bug.h>
+#include <linux/string.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -221,13 +222,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;
}