Commit 9159bc0a authored by Al Viro's avatar Al Viro Committed by Sasha Levin

microblaze: fix copy_from_user()

[ Upstream commit d0cf3851 ]

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 c6ab30df
...@@ -371,10 +371,13 @@ extern long __user_bad(void); ...@@ -371,10 +371,13 @@ extern long __user_bad(void);
static inline long copy_from_user(void *to, static inline long copy_from_user(void *to,
const void __user *from, unsigned long n) const void __user *from, unsigned long n)
{ {
unsigned long res = n;
might_fault(); might_fault();
if (access_ok(VERIFY_READ, from, n)) if (likely(access_ok(VERIFY_READ, from, n)))
return __copy_from_user(to, from, n); res = __copy_from_user(to, from, n);
return n; if (unlikely(res))
memset(to + (n - res), 0, res);
return res;
} }
#define __copy_to_user(to, from, n) \ #define __copy_to_user(to, from, n) \
......
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