diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-20 19:03:37 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-09-29 11:14:36 +0200 |
| commit | 503b87d3d3f77158e2879b4221f3cc38cef6faf6 (patch) | |
| tree | 9d513db8e53c6354b2e50d504a16cdb7ac99322c | |
| parent | dedf843d4ba72e5a1e0a1c05e173c80a0281625a (diff) | |
| download | lwn-503b87d3d3f77158e2879b4221f3cc38cef6faf6.tar.gz lwn-503b87d3d3f77158e2879b4221f3cc38cef6faf6.zip | |
parisc: fix copy_from_user()
commit aace880feea38875fbc919761b77e5732a3659ef upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | arch/parisc/include/asm/uaccess.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index e0a82358517e..9bbddafb0da3 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h @@ -9,6 +9,8 @@ #include <asm/errno.h> #include <asm-generic/uaccess-unaligned.h> +#include <linux/string.h> + #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -246,13 +248,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; } |