x86-64: __copy_from_user_inatomic() adjustments
PATCH 1/1 x86-64: __copy_from_user_inatomic() adjustments
Commit ad2fc2cd925300b8127cf682f5a1c7511ae9dd27 rendered __copy_from_user_inatomic() identical to copy_user_generic(), yet didn't make the former just call the latter from an inline function.
Commit b885808e185a4ec2dfe16c84434f79e95f0245b0 converted the return type of __copy_to_user_inatomic() from unsigned long to int, but didn't do the same to __copy_from_user_inatomic()
--- arch/x86/include/asm/uaccess_64.h | 7 +++++-- arch/x86/kernel/x8664_ksyms_64.c | 1 - arch/x86/lib/copy_user_64.S | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-)
arch/x86/include/asm/uaccess_64.h +5 -2
@@ -176,8 +176,11 @@ __must_check long strlen_user(const char__must_check unsigned long clear_user (void __user *mem,unsigned long len);__must_check unsigned long __clear_user (void __user *mem,unsigned long len); -__must_check long __copy_from_user_inatomic (void *dst,const void __user *src, -unsigned size); +static __must_check __always_inline int +__copy_from_user_inatomic (void *dst,const void __user *src,unsigned size) +{ +return copy_user_generic (dst, (__force const void *)src, size); +} static __must_check __always_inline int__copy_to_user_inatomic (void __user *dst,const void *src,unsigned size)
arch/x86/kernel/x8664_ksyms_64.c +0 -1
@@ -32,7 +32,6 @@ EXPORT_SYMBOL(copy_user_generic);EXPORT_SYMBOL (__copy_user_nocache);EXPORT_SYMBOL (copy_from_user);EXPORT_SYMBOL (copy_to_user); -EXPORT_SYMBOL (__copy_from_user_inatomic);EXPORT_SYMBOL (copy_page);EXPORT_SYMBOL (clear_page);
arch/x86/lib/copy_user_64.S +0 -6
@@ -96,12 +96,6 @@ ENTRY(copy_user_generic) CFI_ENDPROC ENDPROC(copy_user_generic) -ENTRY(__copy_from_user_inatomic) - CFI_STARTPROC - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string - CFI_ENDPROC -ENDPROC(__copy_from_user_inatomic) - .section .fixup,"ax" /* must zero dest */ ENTRY(bad_from_user)
Commit-ID: 14722485830fe6baba738b91d96f06fbd6cf7a18 Gitweb: http://git.kernel.org/tip/14722485830fe6baba738b91d96f06fbd6cf7a18 Author: Jan Beulich <[email protected]> AuthorDate: Fri, 13 Nov 2009 11:56:24 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 15 Nov 2009 09:29:47 +0100
x86-64: __copy_from_user_inatomic() adjustments
This v2.6.26 commit:
ad2fc2c: x86: fix copy_user on x86
rendered __copy_from_user_inatomic() identical to copy_user_generic(), yet didn't make the former just call the latter from an inline function.
Furthermore, this v2.6.19 commit:
b885808: [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic
converted the return type of __copy_to_user_inatomic() from unsigned long to int, but didn't do the same to __copy_from_user_inatomic().
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/uaccess_64.h | 7 +++++-- arch/x86/kernel/x8664_ksyms_64.c | 1 - arch/x86/lib/copy_user_64.S | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-)
arch/x86/include/asm/uaccess_64.h +5 -2
@@ -193,8 +193,11 @@ __must_check long strlen_user(const char __user *str);__must_check unsigned long clear_user (void __user *mem,unsigned long len);__must_check unsigned long __clear_user (void __user *mem,unsigned long len); -__must_check long __copy_from_user_inatomic (void *dst,const void __user *src, -unsigned size); +static __must_check __always_inline int +__copy_from_user_inatomic (void *dst,const void __user *src,unsigned size) +{ +return copy_user_generic (dst, (__force const void *)src, size); +} static __must_check __always_inline int__copy_to_user_inatomic (void __user *dst,const void *src,unsigned size)
arch/x86/kernel/x8664_ksyms_64.c +0 -1
@@ -32,7 +32,6 @@ EXPORT_SYMBOL(copy_user_generic);EXPORT_SYMBOL (__copy_user_nocache);EXPORT_SYMBOL (_copy_from_user);EXPORT_SYMBOL (copy_to_user); -EXPORT_SYMBOL (__copy_from_user_inatomic);EXPORT_SYMBOL (copy_page);EXPORT_SYMBOL (clear_page);
arch/x86/lib/copy_user_64.S +0 -6
@@ -96,12 +96,6 @@ ENTRY(copy_user_generic) CFI_ENDPROC ENDPROC(copy_user_generic) -ENTRY(__copy_from_user_inatomic) - CFI_STARTPROC - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string - CFI_ENDPROC -ENDPROC(__copy_from_user_inatomic) - .section .fixup,"ax" /* must zero dest */ ENTRY(bad_from_user)