diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-20 16:36:36 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-02 21:13:49 -0400 |
| commit | f4859333c64f7a60d0d30514c3e09e8b228830b3 (patch) | |
| tree | ab1aecfd4fdb3460f4e1112dd3458fab2c32d4c1 /arch/nios2 | |
| parent | da879e36261ba8ed9e9b361d1ded01182ced0d16 (diff) | |
nios2: copy_from_user() should zero the tail of destination
[ Upstream commit e33d1f6f72cc82fcfc3d1fb20c9e3ad83b1928fa ]
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/include/asm/uaccess.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/nios2/include/asm/uaccess.h b/arch/nios2/include/asm/uaccess.h index caa51ff85a3c..2b4b9e919675 100644 --- a/arch/nios2/include/asm/uaccess.h +++ b/arch/nios2/include/asm/uaccess.h @@ -102,9 +102,12 @@ extern long __copy_to_user(void __user *to, const void *from, unsigned long n); static inline long copy_from_user(void *to, const void __user *from, unsigned long n) { - if (!access_ok(VERIFY_READ, from, n)) - return n; - return __copy_from_user(to, from, n); + unsigned long res = n; + if (access_ok(VERIFY_READ, from, n)) + res = __copy_from_user(to, from, n); + if (unlikely(res)) + memset(to + (n - res), 0, res); + return res; } static inline long copy_to_user(void __user *to, const void *from, |