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

Commit 8cb834e9 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move __get_user and __put_user into uaccess.h. 



We also carry the unaligned version with us. Only x86_64 uses
it, but there's no problem in defining it.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e30a44fd

include/asm-x86/uaccess.h

+47 −0
Original line number Diff line number Diff line
@@ -383,7 +383,54 @@ struct __large_struct { unsigned long buf[100]; }; 
		     _ASM_EXTABLE(1b, 3b)				\

		     : "=r"(err)					\

		     : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))

/**

 * __get_user: - Get a simple variable from user space, with less checking.

 * @x:   Variable to store result.

 * @ptr: Source address, in user space.

 *

 * Context: User context only.  This function may sleep.

 *

 * This macro copies a single simple variable from user space to kernel

 * space.  It supports simple types like char and int, but not larger

 * data types like structures or arrays.

 *

 * @ptr must have pointer-to-simple-variable type, and the result of

 * dereferencing @ptr must be assignable to @x without a cast.

 *

 * Caller must check the pointer with access_ok() before calling this

 * function.

 *

 * Returns zero on success, or -EFAULT on error.

 * On error, the variable @x is set to zero.

 */



#define __get_user(x, ptr)						\

	__get_user_nocheck((x), (ptr), sizeof(*(ptr)))

/**

 * __put_user: - Write a simple value into user space, with less checking.

 * @x:   Value to copy to user space.

 * @ptr: Destination address, in user space.

 *

 * Context: User context only.  This function may sleep.

 *

 * This macro copies a single simple value from kernel space to user

 * space.  It supports simple types like char and int, but not larger

 * data types like structures or arrays.

 *

 * @ptr must have pointer-to-simple-variable type, and @x must be assignable

 * to the result of dereferencing @ptr.

 *

 * Caller must check the pointer with access_ok() before calling this

 * function.

 *

 * Returns zero on success, or -EFAULT on error.

 */



#define __put_user(x, ptr)						\

	__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))



#define __get_user_unaligned __get_user

#define __put_user_unaligned __put_user



#ifdef CONFIG_X86_32

# include "uaccess_32.h"

include/asm-x86/uaccess_32.h

+0 −46
Original line number Diff line number Diff line
@@ -20,52 +20,6 @@ extern struct movsl_mask { 
} ____cacheline_aligned_in_smp movsl_mask;

#endif



/**

 * __get_user: - Get a simple variable from user space, with less checking.

 * @x:   Variable to store result.

 * @ptr: Source address, in user space.

 *

 * Context: User context only.  This function may sleep.

 *

 * This macro copies a single simple variable from user space to kernel

 * space.  It supports simple types like char and int, but not larger

 * data types like structures or arrays.

 *

 * @ptr must have pointer-to-simple-variable type, and the result of

 * dereferencing @ptr must be assignable to @x without a cast.

 *

 * Caller must check the pointer with access_ok() before calling this

 * function.

 *

 * Returns zero on success, or -EFAULT on error.

 * On error, the variable @x is set to zero.

 */

#define __get_user(x, ptr)				\

	__get_user_nocheck((x), (ptr), sizeof(*(ptr)))





/**

 * __put_user: - Write a simple value into user space, with less checking.

 * @x:   Value to copy to user space.

 * @ptr: Destination address, in user space.

 *

 * Context: User context only.  This function may sleep.

 *

 * This macro copies a single simple value from kernel space to user

 * space.  It supports simple types like char and int, but not larger

 * data types like structures or arrays.

 *

 * @ptr must have pointer-to-simple-variable type, and @x must be assignable

 * to the result of dereferencing @ptr.

 *

 * Caller must check the pointer with access_ok() before calling this

 * function.

 *

 * Returns zero on success, or -EFAULT on error.

 */

#define __put_user(x, ptr)						\

	__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))



unsigned long __must_check __copy_to_user_ll

		(void __user *to, const void *from, unsigned long n);

unsigned long __must_check __copy_from_user_ll

include/asm-x86/uaccess_64.h

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 


#define ARCH_HAS_SEARCH_EXTABLE



#define __get_user(x, ptr)						\

	__get_user_nocheck((x), (ptr), sizeof(*(ptr)))

#define __put_user(x, ptr)						\

	__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))



#define __get_user_unaligned __get_user

#define __put_user_unaligned __put_user



/*

 * Copy To/From Userspace

 */