diff options
author | Jan Beulich <JBeulich@suse.com> | 2013-10-21 09:44:37 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-26 12:27:37 +0200 |
commit | 7a3d9b0f3abbea957b829cdfff8169872c575642 (patch) | |
tree | 905bb8d2f62b5bee5b1523ed6dff08dc81551763 /arch/x86/include/asm/uaccess_64.h | |
parent | 3df7b41aa5e7797f391d0a41f8b0dce1fe366a09 (diff) | |
download | talos-obmc-linux-7a3d9b0f3abbea957b829cdfff8169872c575642.tar.gz talos-obmc-linux-7a3d9b0f3abbea957b829cdfff8169872c575642.zip |
x86: Unify copy_to_user() and add size checking to it
Similarly to copy_from_user(), where the range check is to
protect against kernel memory corruption, copy_to_user() can
benefit from such checking too: Here it protects against kernel
information leaks.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: <arjan@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/5265059502000078000FC4F6@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/uaccess_64.h')
-rw-r--r-- | arch/x86/include/asm/uaccess_64.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 4df93c46852b..0acae710fa00 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h @@ -46,19 +46,9 @@ copy_user_generic(void *to, const void *from, unsigned len) } __must_check unsigned long -_copy_to_user(void __user *to, const void *from, unsigned len); -__must_check unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len); static __always_inline __must_check -int copy_to_user(void __user *dst, const void *src, unsigned size) -{ - might_fault(); - - return _copy_to_user(dst, src, size); -} - -static __always_inline __must_check int __copy_from_user(void *dst, const void __user *src, unsigned size) { int ret = 0; |