summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-09-17 12:57:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-24 10:09:41 +0200
commit352906f9f3f6cd44b356c2be9f924612cb81f79c (patch)
tree960641467f9ebac68be6fca7216add8458b9d43f
parentd48163c414c9fa0c46aaae41b929ba98524d2fb5 (diff)
downloadlwn-352906f9f3f6cd44b356c2be9f924612cb81f79c.tar.gz
lwn-352906f9f3f6cd44b356c2be9f924612cb81f79c.zip
openrisc: fix the fix of copy_from_user()
commit 8e4b72054f554967827e18be1de0e8122e6efc04 upstream. 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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;