summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-08-22 06:39:47 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2016-09-14 00:50:15 +0300
commit6e050503a150b2126620c1a1e9b3a368fcd51eac (patch)
tree587e3e57d967e8e8b6be194d75fabf8ae36fde45 /arch/sh
parentc6852389228df9fb3067f94f3b651de2a7921b36 (diff)
downloadlinux-6e050503a150b2126620c1a1e9b3a368fcd51eac.tar.xz
sh: fix copy_from_user()
Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/include/asm/uaccess.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h
index a49635c51266..92ade79ac427 100644
--- a/arch/sh/include/asm/uaccess.h
+++ b/arch/sh/include/asm/uaccess.h
@@ -151,7 +151,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
__kernel_size_t __copy_size = (__kernel_size_t) n;
if (__copy_size && __access_ok(__copy_from, __copy_size))
- return __copy_user(to, from, __copy_size);
+ __copy_size = __copy_user(to, from, __copy_size);
+
+ if (unlikely(__copy_size))
+ memset(to + (n - __copy_size), 0, __copy_size);
return __copy_size;
}