lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] probe_kernel_address() needs to do set_fs()

Browse Source 
probe_kernel_address() purports to be generic, only it forgot to select
KERNEL_DS, so it presently won't work right on all architectures.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-12-06 20:36:40 -08:00
committed by Linus Torvalds
parent c140e11001
commit 20aa7b21b1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/uaccess.h
View File

@@ -65,14 +65,22 @@ static inline unsigned long __copy_from_user_nocache(void *to,
* do_page_fault() doesn't attempt to take mmap_sem. This makes * do_page_fault() doesn't attempt to take mmap_sem. This makes
* probe_kernel_address() suitable for use within regions where the caller * probe_kernel_address() suitable for use within regions where the caller
* already holds mmap_sem, or other locks which nest inside mmap_sem. * already holds mmap_sem, or other locks which nest inside mmap_sem.
* This must be a macro because __get_user() needs to know the types of the
* args.
*
* We don't include enough header files to be able to do the set_fs(). We
* require that the probe_kernel_address() caller will do that.
*/ */
#define probe_kernel_address(addr, retval) \ #define probe_kernel_address(addr, retval) \
({ \ ({ \
long ret; \ long ret; \
mm_segment_t old_fs = get_fs(); \
\ \
set_fs(KERNEL_DS); \
pagefault_disable(); \ pagefault_disable(); \
ret = __get_user(retval, addr); \ ret = __get_user(retval, addr); \
pagefault_enable(); \ pagefault_enable(); \
set_fs(old_fs); \
ret; \ ret; \
}) })