diff options
author | Guenter Roeck <linux@roeck-us.net> | 2016-09-17 15:57:24 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2016-09-18 10:26:42 -0400 |
commit | 8e4b72054f554967827e18be1de0e8122e6efc04 (patch) | |
tree | 2af6cc02dc448a37ffae36f971a5d9a3e6e7ebd3 | |
parent | 65c0044ca8d7c7bbccae37f0ff2972f0210e9f41 (diff) |
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.h | 2 |
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) | |||
276 | unsigned long res = n; | 276 | unsigned long res = n; |
277 | 277 | ||
278 | if (likely(access_ok(VERIFY_READ, from, n))) | 278 | if (likely(access_ok(VERIFY_READ, from, n))) |
279 | n = __copy_tofrom_user(to, from, n); | 279 | res = __copy_tofrom_user(to, from, n); |
280 | if (unlikely(res)) | 280 | if (unlikely(res)) |
281 | memset(to + (n - res), 0, res); | 281 | memset(to + (n - res), 0, res); |
282 | return res; | 282 | return res; |