From: Al Viro Date: Sat, 20 Aug 2016 23:03:37 +0000 (-0400) Subject: parisc: fix copy_from_user() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aace880feea38875fbc919761b77e5732a3659ef;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git parisc: fix copy_from_user() Cc: stable@vger.kernel.org Signed-off-by: Al Viro --- diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index 0f59fd9ca205..37a1bee96444 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h @@ -10,6 +10,7 @@ #include #include +#include #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -221,13 +222,14 @@ static inline unsigned long __must_check copy_from_user(void *to, unsigned long n) { int sz = __compiletime_object_size(to); - int ret = -EFAULT; + unsigned long ret = n; if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n)) ret = __copy_from_user(to, from, n); else copy_from_user_overflow(); - + if (unlikely(ret)) + memset(to + (n - ret), 0, ret); return ret; }