Commit 462578fa authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman

metag: copy_from_user() should zero the destination on access_ok() failure

commit 8ae95ed4 upstream.
Acked-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f79347fe
...@@ -204,8 +204,9 @@ extern unsigned long __must_check __copy_user_zeroing(void *to, ...@@ -204,8 +204,9 @@ extern unsigned long __must_check __copy_user_zeroing(void *to,
static inline unsigned long static inline unsigned long
copy_from_user(void *to, const void __user *from, unsigned long n) copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
if (access_ok(VERIFY_READ, from, n)) if (likely(access_ok(VERIFY_READ, from, n)))
return __copy_user_zeroing(to, from, n); return __copy_user_zeroing(to, from, n);
memset(to, 0, n);
return n; return 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