summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>2008-11-13 18:06:04 -0800
committerIngo Molnar <mingo@elte.hu>2008-11-18 22:28:58 +0100
commit20a4a236c7de5c915551cdc562482aa53eaff40e (patch)
treea801472196c4cb994309d767c15c90317e05cf0c
parent093bac154c142fa1fb31a3ac69ae1bc08930231b (diff)
downloadop-kernel-dev-20a4a236c7de5c915551cdc562482aa53eaff40e.zip
op-kernel-dev-20a4a236c7de5c915551cdc562482aa53eaff40e.tar.gz
x86: uaccess_64: fix return value in __copy_from_user()
__copy_from_user() will return invalid value 16 when it fails to access user space and the size is 10. Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/include/asm/uaccess_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index 664f152..f8cfd00 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -46,7 +46,7 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size)
return ret;
case 10:
__get_user_asm(*(u64 *)dst, (u64 __user *)src,
- ret, "q", "", "=r", 16);
+ ret, "q", "", "=r", 10);
if (unlikely(ret))
return ret;
__get_user_asm(*(u16 *)(8 + (char *)dst),
OpenPOWER on IntegriCloud