Commit 6153b7f5 authored by Al Viro's avatar Al Viro Committed by Jiri Slaby

asm-generic: make copy_from_user() zero the destination properly

commit 2545e5da upstream.

... in all cases, including the failing access_ok()

Note that some architectures using asm-generic/uaccess.h have
__copy_from_user() not zeroing the tail on failure halfway
through.  This variant works either way.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent d41370b5
...@@ -259,11 +259,13 @@ extern int __get_user_bad(void) __attribute__((noreturn)); ...@@ -259,11 +259,13 @@ extern int __get_user_bad(void) __attribute__((noreturn));
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);
else if (unlikely(res))
return n; memset(to + (n - res), 0, res);
return res;
} }
static inline long copy_to_user(void __user *to, static inline long copy_to_user(void __user *to,
......
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