Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / mm / maccess.c

diff --git a/mm/maccess.c b/mm/maccess.c
index 24f81b9..ac40796 100644 (file)
--- a/mm/maccess.c
+++ b/mm/maccess.c
@@ -17,11 +17,14 @@
 long probe_kernel_read(void *dst, void *src, size_t size)
 {
        long ret;
+       mm_segment_t old_fs = get_fs();
 
+       set_fs(KERNEL_DS);
        pagefault_disable();
        ret = __copy_from_user_inatomic(dst,
                        (__force const void __user *)src, size);
        pagefault_enable();
+       set_fs(old_fs);
 
        return ret ? -EFAULT : 0;
 }
@@ -39,10 +42,13 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
 long probe_kernel_write(void *dst, void *src, size_t size)
 {
        long ret;
+       mm_segment_t old_fs = get_fs();
 
+       set_fs(KERNEL_DS);
        pagefault_disable();
        ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
        pagefault_enable();
+       set_fs(old_fs);
 
        return ret ? -EFAULT : 0;
 }