evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
commit a5e541f796f17228793694d64b507f5f57db4cd7 upstream.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Al Viro 2016-08-18 21:31:41 -04:00 • committed by Greg Kroah-Hartman
parent 2fbc61d977
commit 005a4638ae
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/ia64/include/asm/uaccess.h
View file

@ -263,17 +263,15 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
__cu_len; \ __cu_len; \
}) })
#define copy_from_user(to, from, n) \ static inline unsigned long
({ \ copy_from_user(void *to, const void __user *from, unsigned long n)
void *__cu_to = (to); \ {
const void __user *__cu_from = (from); \ if (likely(__access_ok(from, n, get_fs())))
long __cu_len = (n); \ n = __copy_user((__force void __user *) to, from, n);
\ else
__chk_user_ptr(__cu_from); \ memset(to, 0, n);
if (__access_ok(__cu_from, __cu_len, get_fs())) \ return n;
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ }
__cu_len; \
})
#define __copy_in_user(to, from, size) __copy_user((to), (from), (size)) #define __copy_in_user(to, from, size) __copy_user((to), (from), (size))