Commit 0f8ac3ee authored by Guenter Roeck's avatar Guenter Roeck Committed by Ben Hutchings

openrisc: fix the fix of copy_from_user()

commit 8e4b7205 upstream.

Since commit acb2505d ("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: acb2505d ("openrisc: fix copy_from_user()")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 90c9255c
...@@ -276,7 +276,7 @@ copy_from_user(void *to, const void *from, unsigned long n) ...@@ -276,7 +276,7 @@ copy_from_user(void *to, const void *from, unsigned long n)
unsigned long res = n; unsigned long res = n;
if (likely(access_ok(VERIFY_READ, from, 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)) if (unlikely(res))
memset(to + (n - res), 0, res); memset(to + (n - res), 0, res);
return res; return res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment