diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-08-22 00:23:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-24 10:09:40 +0200 |
commit | 815dce4e98e1d214751537662b5817af339906bf (patch) | |
tree | 8fa68da02a768223a0d75b8fff2f4cc7eac24c74 | |
parent | be56090aa902e48559089531f3172acfab696fc9 (diff) | |
download | lwn-815dce4e98e1d214751537662b5817af339906bf.tar.gz lwn-815dce4e98e1d214751537662b5817af339906bf.zip |
sparc32: fix copy_from_user()
commit 917400cecb4b52b5cde5417348322bb9c8272fa6 upstream.
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 57aca2792d29..3e8de69c6dcc 100644 --- a/arch/sparc/include/asm/uaccess_32.h +++ b/arch/sparc/include/asm/uaccess_32.h @@ -263,8 +263,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) |