diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-22 00:23:07 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-02 21:14:47 -0400 |
| commit | 09d5ea250b975f9aa7678ad9f95247173ad30778 (patch) | |
| tree | b9de90b217a9d3bd8550e7feb4c479475a4fbbdd /arch/sparc | |
| parent | 0fe6f5c0f9ac106de9c601b56e44bb84aef56f73 (diff) | |
sparc32: fix copy_from_user()
[ Upstream commit 917400cecb4b52b5cde5417348322bb9c8272fa6 ]
Cc: stable@vger.kernel.org
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/uaccess_32.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h index 64ee103dc29d..dfb542c7cc71 100644 --- a/arch/sparc/include/asm/uaccess_32.h +++ b/arch/sparc/include/asm/uaccess_32.h @@ -328,8 +328,10 @@ static inline unsigned long copy_from_user(void *to, const void __user *from, un { if (n && __access_ok((unsigned long) from, n)) return __copy_user((__force void __user *) to, from, n); - else + else { + memset(to, 0, n); return n; + } } static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) |