summaryrefslogtreecommitdiff
path: root/arch/nios2
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-08-20 23:36:36 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2016-09-14 00:49:43 +0300
commite33d1f6f72cc82fcfc3d1fb20c9e3ad83b1928fa (patch)
treec011629541620a24690d290b7283c694f41311e7 /arch/nios2
parentae7cc577ec2a4a6151c9e928fd1f595d953ecef1 (diff)
downloadlinux-e33d1f6f72cc82fcfc3d1fb20c9e3ad83b1928fa.tar.xz
nios2: copy_from_user() should zero the tail of destination
Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/include/asm/uaccess.h9
1 files changed, 6 insertions, 3 deletions
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,