diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-20 19:03:37 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-02 21:14:04 -0400 |
| commit | f39be7f631c7ce7b721b0568510b73266ce4b3e9 (patch) | |
| tree | 845845cd0d9d2a83911ef1f16532ae289cc7a28f /arch/parisc | |
| parent | cc148fe4483004a44c19bedfd70413c59edc8305 (diff) | |
parisc: fix copy_from_user()
[ Upstream commit aace880feea38875fbc919761b77e5732a3659ef ]
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/uaccess.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index 1960b87c1c8b..4ad51465890b 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 @@ -245,13 +246,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; } |