Commit 6df1c176 authored by Heiko Carstens's avatar Heiko Carstens Committed by David S. Miller

sparc: copy_from_user() should not return -EFAULT

From: Heiko Carstens <heiko.carstens@de.ibm.com>

Callers of copy_from_user() expect it to return the number of bytes
it could not copy. In no case it is supposed to return -EFAULT.

In case of a detected buffer overflow just return the requested
length. In addition one could think of a memset that would clear
the size of the target object.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e04ed38d
...@@ -274,7 +274,7 @@ static inline unsigned long copy_from_user(void *to, const void __user *from, un ...@@ -274,7 +274,7 @@ static inline unsigned long copy_from_user(void *to, const void __user *from, un
if (unlikely(sz != -1 && sz < n)) { if (unlikely(sz != -1 && sz < n)) {
copy_from_user_overflow(); copy_from_user_overflow();
return -EFAULT; return n;
} }
if (n && __access_ok((unsigned long) from, n)) if (n && __access_ok((unsigned long) from, n))
......
...@@ -221,8 +221,8 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from, ...@@ -221,8 +221,8 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
static inline unsigned long __must_check static inline unsigned long __must_check
copy_from_user(void *to, const void __user *from, unsigned long size) copy_from_user(void *to, const void __user *from, unsigned long size)
{ {
unsigned long ret = (unsigned long) -EFAULT;
int sz = __compiletime_object_size(to); int sz = __compiletime_object_size(to);
unsigned long ret = size;
if (likely(sz == -1 || sz >= size)) { if (likely(sz == -1 || sz >= size)) {
ret = ___copy_from_user(to, from, size); ret = ___copy_from_user(to, from, size);
......
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