Commit f4859333 authored by Al Viro's avatar Al Viro Committed by Sasha Levin

nios2: copy_from_user() should zero the tail of destination

[ Upstream commit e33d1f6f ]

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent da879e36
...@@ -102,9 +102,12 @@ extern long __copy_to_user(void __user *to, const void *from, unsigned long n); ...@@ -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, static inline long copy_from_user(void *to, const void __user *from,
unsigned long n) unsigned long n)
{ {
if (!access_ok(VERIFY_READ, from, n)) unsigned long res = n;
return n; if (access_ok(VERIFY_READ, from, n))
return __copy_from_user(to, 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, static inline long copy_to_user(void __user *to, const void *from,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment