maccess-move-user-access-routines-together.patch removed from -mm tree
The patch titled
Subject: maccess: move user access routines together
has been removed from the -mm tree. Its filename was
maccess-move-user-access-routines-together.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: maccess: move user access routines together
Move kernel access vs user access routines together to ease upcoming ifdefs.
---
mm/maccess.c | 112 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 56 deletions(-)
mm/maccess.c renamed from mm/maccess.c~maccess-move-user-access-routines-together +56 -56
@@ -47,34 +47,6 @@ long probe_kernel_read(void *dst, constEXPORT_SYMBOL_GPL (probe_kernel_read);/** -* probe_user_read(): safely attempt to read from a user-space location -* @dst: pointer to the buffer that shall take the data -* @src: address to read from. This must be a user address. -* @size: size of the data chunk -* -* Safely read from user address @src to the buffer at @dst. If a kernel fault -* happens, handle that and return -EFAULT. -*/ -long probe_user_read (void *dst,const void __user *src,size_t size) -{ -long ret = -EFAULT ; -mm_segment_t old_fs =get_fs (); - -set_fs (USER_DS ); -if (access_ok (src, size)) { -pagefault_disable (); - ret =__copy_from_user_inatomic (dst, src, size); -pagefault_enable (); - } -set_fs (old_fs); - -if (ret) -return -EFAULT ; -return 0 ; -} -EXPORT_SYMBOL_GPL (probe_user_read); - -/** * probe_kernel_write(): safely attempt to write to a location * @dst: address to write to * @src: pointer to the data that shall be written
@@ -100,34 +72,6 @@ long probe_kernel_write(void *dst, const }/** -* probe_user_write(): safely attempt to write to a user-space location -* @dst: address to write to -* @src: pointer to the data that shall be written -* @size: size of the data chunk -* -* Safely write to address @dst from the buffer at @src. If a kernel fault -* happens, handle that and return -EFAULT. -*/ -long probe_user_write (void __user *dst,const void *src,size_t size) -{ -long ret = -EFAULT ; -mm_segment_t old_fs =get_fs (); - -set_fs (USER_DS ); -if (access_ok (dst, size)) { -pagefault_disable (); - ret =__copy_to_user_inatomic (dst, src, size); -pagefault_enable (); - } -set_fs (old_fs); - -if (ret) -return -EFAULT ; -return 0 ; -} -EXPORT_SYMBOL_GPL (probe_user_write); - -/** * strncpy_from_kernel_nofault: - Copy a NUL terminated string from unsafe * address. * @dst: Destination address, in kernel space. This buffer must be at
@@ -171,6 +115,62 @@ long strncpy_from_kernel_nofault(char *d }/** +* probe_user_read(): safely attempt to read from a user-space location +* @dst: pointer to the buffer that shall take the data +* @src: address to read from. This must be a user address. +* @size: size of the data chunk +* +* Safely read from user address @src to the buffer at @dst. If a kernel fault +* happens, handle that and return -EFAULT. +*/ +long probe_user_read (void *dst,const void __user *src,size_t size) +{ +long ret = -EFAULT ; +mm_segment_t old_fs =get_fs (); + +set_fs (USER_DS ); +if (access_ok (src, size)) { +pagefault_disable (); + ret =__copy_from_user_inatomic (dst, src, size); +pagefault_enable (); + } +set_fs (old_fs); + +if (ret) +return -EFAULT ; +return 0 ; +} +EXPORT_SYMBOL_GPL (probe_user_read); + +/** +* probe_user_write(): safely attempt to write to a user-space location +* @dst: address to write to +* @src: pointer to the data that shall be written +* @size: size of the data chunk +* +* Safely write to address @dst from the buffer at @src. If a kernel fault +* happens, handle that and return -EFAULT. +*/ +long probe_user_write (void __user *dst,const void *src,size_t size) +{ +long ret = -EFAULT ; +mm_segment_t old_fs =get_fs (); + +set_fs (USER_DS ); +if (access_ok (dst, size)) { +pagefault_disable (); + ret =__copy_to_user_inatomic (dst, src, size); +pagefault_enable (); + } +set_fs (old_fs); + +if (ret) +return -EFAULT ; +return 0 ; +} +EXPORT_SYMBOL_GPL (probe_user_write); + +/** * strncpy_from_user_nofault: - Copy a NUL terminated string from unsafe user * address. * @dst: Destination address, in kernel space. This buffer must be at
_
Patches currently in -mm which might be from [email protected] are
amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch