summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/skas
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2013-05-11 15:35:32 +0200
committerRichard Weinberger <richard@nod.at>2013-07-19 10:45:17 +0200
commit3179ce7254ffa43f3ba4409f31a954ecc4a8d408 (patch)
tree0af7d0b24486289bc0333f5812eac1b7cddea9e6 /arch/um/kernel/skas
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-3179ce7254ffa43f3ba4409f31a954ecc4a8d408.tar.xz
linux-3179ce7254ffa43f3ba4409f31a954ecc4a8d408.zip
um: Fix return value of strnlen_user()
In case of an error it must not return -EFAULT. Return 0 like all other archs do. Reported-by: toralf.foerster@gmx.de Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/kernel/skas')
-rw-r--r--arch/um/kernel/skas/uaccess.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index 1d3e0c17340b..4ffb644d6c07 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -254,6 +254,6 @@ int strnlen_user(const void __user *str, int len)
n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count);
if (n == 0)
return count + 1;
- return -EFAULT;
+ return 0;
}
EXPORT_SYMBOL(strnlen_user);