Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14722485 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86-64: __copy_from_user_inatomic() adjustments 



This v2.6.26 commit:

    ad2fc2cd: 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:

    b885808e: [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().

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: <v.mayatskih@gmail.com>
LKML-Reference: <4AFD5778020000780001F8F4@vpn.id2.novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c12a229b

arch/x86/include/asm/uaccess_64.h

+5 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)