diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-09-17 12:57:24 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-09 21:21:06 -0400 |
| commit | 56991065c36aac44cc2b38dba6c1f038abcbfd8f (patch) | |
| tree | 60f5af235f9c6a79b2f8ad714148c8ea6c8a5d09 | |
| parent | 2abcdcc42f4f030137ea36efd02ccf0e724dfb3d (diff) | |
| download | lwn-56991065c36aac44cc2b38dba6c1f038abcbfd8f.tar.gz lwn-56991065c36aac44cc2b38dba6c1f038abcbfd8f.zip | |
openrisc: fix the fix of copy_from_user()
[ Upstream commit 8e4b72054f554967827e18be1de0e8122e6efc04 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -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) 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; |