diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-18 21:31:41 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-05 22:40:20 -0400 |
| commit | ddc84f7b3093f0e29252f155d74191fef3746a86 (patch) | |
| tree | 69f344e34f767100b5745d7bc81d85bcc5a4ed3e | |
| parent | 591ca382baa0416352fd917bc33bf05491a270c6 (diff) | |
| download | lwn-ddc84f7b3093f0e29252f155d74191fef3746a86.tar.gz lwn-ddc84f7b3093f0e29252f155d74191fef3746a86.zip | |
ia64: copy_from_user() should zero the destination on access_ok() failure
[ Upstream commit a5e541f796f17228793694d64b507f5f57db4cd7 ]
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | arch/ia64/include/asm/uaccess.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h index 449c8c0fa2bd..810926c56e31 100644 --- a/arch/ia64/include/asm/uaccess.h +++ b/arch/ia64/include/asm/uaccess.h @@ -262,17 +262,15 @@ __copy_from_user (void *to, const void __user *from, unsigned long count) __cu_len; \ }) -#define copy_from_user(to, from, n) \ -({ \ - void *__cu_to = (to); \ - const void __user *__cu_from = (from); \ - long __cu_len = (n); \ - \ - __chk_user_ptr(__cu_from); \ - if (__access_ok(__cu_from, __cu_len, get_fs())) \ - __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ - __cu_len; \ -}) +static inline unsigned long +copy_from_user(void *to, const void __user *from, unsigned long n) +{ + if (likely(__access_ok(from, n, get_fs()))) + n = __copy_user((__force void __user *) to, from, n); + else + memset(to, 0, n); + return n; +} #define __copy_in_user(to, from, size) __copy_user((to), (from), (size)) |