aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-09-17 12:57:24 -0700
committerGuenter Roeck <linux@roeck-us.net>2016-09-18 07:26:42 -0700
commit8e4b72054f554967827e18be1de0e8122e6efc04 (patch)
tree2af6cc02dc448a37ffae36f971a5d9a3e6e7ebd3
parent65c0044ca8d7c7bbccae37f0ff2972f0210e9f41 (diff)
downloadlinux-stericsson-8e4b72054f554967827e18be1de0e8122e6efc04.tar.gz
openrisc: fix the fix of copy_from_user()
Since commit acb2505d0119 ("openrisc: fix copy_from_user()"), copy_from_user() returns the number of bytes requested, not the number of bytes not copied. Cc: Al Viro <viro@zeniv.linux.org.uk> Fixes: acb2505d0119 ("openrisc: fix copy_from_user()") Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--arch/openrisc/include/asm/uaccess.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h
index cbad29b5a131..5cc6b4f1b795 100644
--- a/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@@ -276,7 +276,7 @@ copy_from_user(void *to, const void *from, unsigned long n)
unsigned long res = n;
if (likely(access_ok(VERIFY_READ, from, n)))
- n = __copy_tofrom_user(to, from, n);
+ res = __copy_tofrom_user(to, from, n);
if (unlikely(res))
memset(to + (n - res), 0, res);
return res;