new helper: uaccess_kernel()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/alpha/include/asm/uaccess.h b/arch/alpha/include/asm/uaccess.h
index 77c55ce899365cb664c8a73f6cdb07ff287cce78..b2f62b98e2905e3db31d7c6bd894887cc8d25ad4 100644 (file)
--- a/arch/alpha/include/asm/uaccess.h
+++ b/arch/alpha/include/asm/uaccess.h
@@ -425,7 +425,7 @@ clear_user(void __user *to, long len)
 #undef __module_call
 
 #define user_addr_max() \
-        (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
+        (uaccess_kernel() ? ~0UL : TASK_SIZE)
 
 extern long strncpy_from_user(char *dest, const char __user *src, long count);
 extern __must_check long strlen_user(const char __user *str);

diff --git a/arch/arc/include/asm/uaccess.h b/arch/arc/include/asm/uaccess.h
index d837a53c6e590a53adff809d374725521b87eb8d..ffd14e630aca7067262c9cf0d7ac6109fc8d314f 100644 (file)
--- a/arch/arc/include/asm/uaccess.h
+++ b/arch/arc/include/asm/uaccess.h
@@ -27,7 +27,7 @@
 #include <linux/string.h>      /* for generic string functions */
 
 
-#define __kernel_ok            (segment_eq(get_fs(), KERNEL_DS))
+#define __kernel_ok            (uaccess_kernel())
 
 /*
  * Algorithmically, for __user_ok() we want do:

diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 9677a7cf7987efcd97d5504f4b1a19f15848eda1..b63527359d52e44c31b004c991271b458ba20775 100644 (file)
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -266,7 +266,7 @@ static inline void set_fs(mm_segment_t fs)
 #define access_ok(type, addr, size)    (__range_ok(addr, size) == 0)
 
 #define user_addr_max() \
-       (segment_eq(get_fs(), KERNEL_DS) ? ~0UL : get_fs())
+       (uaccess_kernel() ? ~0UL : get_fs())
 
 /*
  * The "__xxx" versions of the user access functions do not verify the

diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
index 6bd1089b07e0960830ed6bd6a8345202b7efd8b0..9b4ed172861615fa94f628fb3eea067176ef3bae 100644 (file)
--- a/arch/arm/lib/uaccess_with_memcpy.c
+++ b/arch/arm/lib/uaccess_with_memcpy.c
@@ -90,7 +90,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
        unsigned long ua_flags;
        int atomic;
 
-       if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
+       if (uaccess_kernel()) {
                memcpy((void *)to, from, n);
                return 0;
        }
@@ -162,7 +162,7 @@ __clear_user_memset(void __user *addr, unsigned long n)
 {
        unsigned long ua_flags;
 
-       if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
+       if (uaccess_kernel()) {
                memset((void *)addr, 0, n);
                return 0;
        }

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 89d5162d4ca67594395d5e787392c39883ec79f8..89814850b08bf0cded0c796c3cb43c0b4580f32b 100644 (file)
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -370,7 +370,7 @@ int _access_ok(unsigned long addr, unsigned long size)
        /* Check that things do not wrap around */
        if (addr > ULONG_MAX - size)
                return 0;
-       if (segment_eq(get_fs(), KERNEL_DS))
+       if (uaccess_kernel())
                return 1;
 #ifdef CONFIG_MTD_UCLINUX
        if (1)

diff --git a/arch/c6x/kernel/sys_c6x.c b/arch/c6x/kernel/sys_c6x.c
index 3e9bdfbee8adeb4521391c70f87210cbb858aff9..a742ae25923969c5621fa3ae7e52e6c5a7757374 100644 (file)
--- a/arch/c6x/kernel/sys_c6x.c
+++ b/arch/c6x/kernel/sys_c6x.c
@@ -23,7 +23,7 @@ int _access_ok(unsigned long addr, unsigned long size)
        if (!addr || addr > (0xffffffffUL - (size - 1)))
                goto _bad_access;
 
-       if (segment_eq(get_fs(), KERNEL_DS))
+       if (uaccess_kernel())
                return 1;
 
        if (memory_start <= addr && (addr + size - 1) < memory_end)

diff --git a/arch/cris/include/asm/uaccess.h b/arch/cris/include/asm/uaccess.h
index c2462ef04eaf5dde9db8e5b5db18d6bbeff9abc7..5f5b8f53d2d7afa760f2bb4069e3adb24647a45c 100644 (file)
--- a/arch/cris/include/asm/uaccess.h
+++ b/arch/cris/include/asm/uaccess.h
@@ -43,7 +43,7 @@
 
 #define segment_eq(a, b)       ((a).seg == (b).seg)
 
-#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
+#define __kernel_ok (uaccess_kernel())
 #define __user_ok(addr, size) \
        (((size) <= TASK_SIZE) && ((addr) <= TASK_SIZE-(size)))
 #define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size)))

diff --git a/arch/m68k/include/asm/uaccess_mm.h b/arch/m68k/include/asm/uaccess_mm.h
index fb72b710759e213b2e880e46c22b042edb3cf278..14054a4e4216e6ddc8d26a9665e4f5f09e527299 100644 (file)
--- a/arch/m68k/include/asm/uaccess_mm.h
+++ b/arch/m68k/include/asm/uaccess_mm.h
@@ -375,7 +375,7 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
 #define copy_to_user(to, from, n)      __copy_to_user(to, from, n)
 
 #define user_addr_max() \
-       (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
+       (uaccess_kernel() ? ~0UL : TASK_SIZE)
 
 extern long strncpy_from_user(char *dst, const char __user *src, long count);
 extern __must_check long strlen_user(const char __user *str);

diff --git a/arch/metag/include/asm/uaccess.h b/arch/metag/include/asm/uaccess.h
index 7fc5277ae71f3e8a4a939b8cb21ae729a979c968..83de7554d2b33b649a8ec4aa84389b165a4af732 100644 (file)
--- a/arch/metag/include/asm/uaccess.h
+++ b/arch/metag/include/asm/uaccess.h
@@ -24,7 +24,7 @@
 
 #define segment_eq(a, b)       ((a).seg == (b).seg)
 
-#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
+#define __kernel_ok (uaccess_kernel())
 /*
  * Explicitly allow NULL pointers here. Parts of the kernel such
  * as readv/writev use access_ok to validate pointers, but want

diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h
index c8b574f7e0ccc293c4e1ae7d1a862328ac906648..77cad232a1c61cde88587230374ba153dd6bc975 100644 (file)
--- a/arch/mips/include/asm/checksum.h
+++ b/arch/mips/include/asm/checksum.h
@@ -50,7 +50,7 @@ __wsum csum_partial_copy_from_user(const void __user *src, void *dst, int len,
                                   __wsum sum, int *err_ptr)
 {
        might_fault();
-       if (segment_eq(get_fs(), get_ds()))
+       if (uaccess_kernel())
                return __csum_partial_copy_kernel((__force void *)src, dst,
                                                  len, sum, err_ptr);
        else
@@ -82,7 +82,7 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len,
 {
        might_fault();
        if (access_ok(VERIFY_WRITE, dst, len)) {
-               if (segment_eq(get_fs(), get_ds()))
+               if (uaccess_kernel())
                        return __csum_partial_copy_kernel(src,
                                                          (__force void *)dst,
                                                          len, sum, err_ptr);

diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h
index 55fd94e6cd0b1f2c79294f59bf4bc3b0bc702c66..7f12d7e27c94ef5e78a49478359cad68bc4a1eb4 100644 (file)
--- a/arch/mips/include/asm/r4kcache.h
+++ b/arch/mips/include/asm/r4kcache.h
@@ -20,7 +20,7 @@
 #include <asm/cpu-features.h>
 #include <asm/cpu-type.h>
 #include <asm/mipsmtregs.h>
-#include <linux/uaccess.h> /* for segment_eq() */
+#include <linux/uaccess.h> /* for uaccess_kernel() */
 
 extern void (*r4k_blast_dcache)(void);
 extern void (*r4k_blast_icache)(void);
@@ -714,7 +714,7 @@ static inline void protected_blast_##pfx##cache##_range(unsigned long start,\
                                                                        \
        __##pfx##flush_prologue                                         \
                                                                        \
-       if (segment_eq(get_fs(), USER_DS)) {                            \
+       if (!uaccess_kernel()) {                                        \
                while (1) {                                             \
                        protected_cachee_op(hitop, addr);               \
                        if (addr == aend)                               \

diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index dd25b312c9737116a094eb540f8964941c4a0ee9..70ca8eee166a8e7a1a8a6535483e415659dd565e 100644 (file)
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -88,7 +88,7 @@ static inline bool eva_kernel_access(void)
        if (!IS_ENABLED(CONFIG_EVA))
                return false;
 
-       return segment_eq(get_fs(), get_ds());
+       return uaccess_kernel();
 }
 
 /*

diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 7ed98354fe9daabd4237690e9e73a4d8decaa826..f806ee56e63932c6fc2ec7fe3ccbce654350c5d9 100644 (file)
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -1026,7 +1026,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                        goto sigbus;
 
                if (IS_ENABLED(CONFIG_EVA)) {
-                       if (segment_eq(get_fs(), get_ds()))
+                       if (uaccess_kernel())
                                LoadHW(addr, value, res);
                        else
                                LoadHWE(addr, value, res);
@@ -1045,7 +1045,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                        goto sigbus;
 
                if (IS_ENABLED(CONFIG_EVA)) {
-                       if (segment_eq(get_fs(), get_ds()))
+                       if (uaccess_kernel())
                                LoadW(addr, value, res);
                        else
                                LoadWE(addr, value, res);
@@ -1064,7 +1064,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                        goto sigbus;
 
                if (IS_ENABLED(CONFIG_EVA)) {
-                       if (segment_eq(get_fs(), get_ds()))
+                       if (uaccess_kernel())
                                LoadHWU(addr, value, res);
                        else
                                LoadHWUE(addr, value, res);
@@ -1132,7 +1132,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                value = regs->regs[insn.i_format.rt];
 
                if (IS_ENABLED(CONFIG_EVA)) {
-                       if (segment_eq(get_fs(), get_ds()))
+                       if (uaccess_kernel())
                                StoreHW(addr, value, res);
                        else
                                StoreHWE(addr, value, res);
@@ -1152,7 +1152,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                value = regs->regs[insn.i_format.rt];
 
                if (IS_ENABLED(CONFIG_EVA)) {
-                       if (segment_eq(get_fs(), get_ds()))
+                       if (uaccess_kernel())
                                StoreW(addr, value, res);
                        else
                                StoreWE(addr, value, res);

diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h
index 0b0f60444b767f31d2720ce9e95687aec77ab3c6..227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76 100644 (file)
--- a/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@@ -292,7 +292,7 @@ clear_user(void *addr, unsigned long size)
 }
 
 #define user_addr_max() \
-       (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
+       (uaccess_kernel() ? ~0UL : TASK_SIZE)
 
 extern long strncpy_from_user(char *dest, const char __user *src, long count);
 

diff --git a/arch/parisc/include/asm/futex.h b/arch/parisc/include/asm/futex.h
index ac8bd586ace8d17329e2536244b7833c0db46c83..0ba14300cd8e8bf09b0331ac004c98e601aa3bb2 100644 (file)
--- a/arch/parisc/include/asm/futex.h
+++ b/arch/parisc/include/asm/futex.h
@@ -109,7 +109,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
        /* futex.c wants to do a cmpxchg_inatomic on kernel NULL, which is
         * our gateway page, and causes no end of trouble...
         */
-       if (segment_eq(KERNEL_DS, get_fs()) && !uaddr)
+       if (uaccess_kernel() && !uaddr)
                return -EFAULT;
 
        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))

diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index f82ff10ed974117a59f8713eba4281350feb44aa..66f5160136c2652cbd5491828421d87a1e075a11 100644 (file)
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -76,7 +76,7 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
                goto label;                                             \
 } while (0)
 
-#define get_user_space() (segment_eq(get_fs(), KERNEL_DS) ? 0 : mfsp(3))
+#define get_user_space() (uaccess_kernel() ? 0 : mfsp(3))
 #define get_kernel_space() (0)
 
 #define MERGE(w0, sh_1, w1, sh_2)  ({                                  \

diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 9e9a5e8d6cf6d496ce57d85fb35b6140f8ecb859..7228ed8da67d73a553e1583cb39c5d07e44d33e5 100644 (file)
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -37,7 +37,7 @@
 static inline void set_fs(mm_segment_t fs)
 {
        current->thread.mm_segment = fs;
-       if (segment_eq(fs, KERNEL_DS)) {
+       if (uaccess_kernel()) {
                set_cpu_flag(CIF_ASCE_SECONDARY);
                __ctl_load(S390_lowcore.kernel_asce, 7, 7);
        } else {

diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
index bd56c28fff9fea8cdec3e98fe7e155a61f1d55bb..9e068bf9060a77a9dd73fc6defa56b6b65e38e41 100644 (file)
--- a/arch/sparc/include/asm/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -7,7 +7,7 @@
 #endif
 
 #define user_addr_max() \
-       (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
+       (uaccess_kernel() ? ~0UL : TASK_SIZE)
 
 long strncpy_from_user(char *dest, const char __user *src, long count);
 

diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
index 952d512a64f21ffb32fdfe8d23eed79a1e22fabc..a59a1e81986d9014892dee82ba00be23940ddb89 100644 (file)
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
@@ -36,7 +36,7 @@
  * large size and address near to PAGE_OFFSET - a fault will break his intentions.
  */
 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
-#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
+#define __kernel_ok (uaccess_kernel())
 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
 #define access_ok(type, addr, size) \
        ({ (void)(type); __access_ok((unsigned long)(addr), size); })

diff --git a/arch/um/include/asm/uaccess.h b/arch/um/include/asm/uaccess.h
index 076bdcb0c2ad8e5d8ce50dfe75a68d04d66785fa..e992bb57da5a7df21d80cb6bff4cbd94cd0432a1 100644 (file)
--- a/arch/um/include/asm/uaccess.h
+++ b/arch/um/include/asm/uaccess.h
@@ -45,7 +45,7 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
        return __addr_range_nowrap(addr, size) &&
                (__under_task_size(addr, size) ||
                __access_ok_vsyscall(addr, size) ||
-               segment_eq(get_fs(), KERNEL_DS));
+               uaccess_kernel());
 }
 
 #endif

diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index 85ac8adb069bb9a3d64e1f57daa49f950ac9b50e..22c9f79db8e6492d7cad7ff32088bdaf0b3d0205 100644 (file)
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -141,7 +141,7 @@ static int copy_chunk_from_user(unsigned long from, int len, void *arg)
 
 long __copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-       if (segment_eq(get_fs(), KERNEL_DS)) {
+       if (uaccess_kernel()) {
                memcpy(to, (__force void*)from, n);
                return 0;
        }
@@ -161,7 +161,7 @@ static int copy_chunk_to_user(unsigned long to, int len, void *arg)
 
 long __copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-       if (segment_eq(get_fs(), KERNEL_DS)) {
+       if (uaccess_kernel()) {
                memcpy((__force void *) to, from, n);
                return 0;
        }
@@ -189,7 +189,7 @@ long __strncpy_from_user(char *dst, const char __user *src, long count)
        long n;
        char *ptr = dst;
 
-       if (segment_eq(get_fs(), KERNEL_DS)) {
+       if (uaccess_kernel()) {
                strncpy(dst, (__force void *) src, count);
                return strnlen(dst, count);
        }
@@ -210,7 +210,7 @@ static int clear_chunk(unsigned long addr, int len, void *unused)
 
 unsigned long __clear_user(void __user *mem, unsigned long len)
 {
-       if (segment_eq(get_fs(), KERNEL_DS)) {
+       if (uaccess_kernel()) {
                memset((__force void*)mem, 0, len);
                return 0;
        }
@@ -235,7 +235,7 @@ long __strnlen_user(const void __user *str, long len)
 {
        int count = 0, n;
 
-       if (segment_eq(get_fs(), KERNEL_DS))
+       if (uaccess_kernel())
                return strnlen((__force char*)str, len) + 1;
 
        n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count);

diff --git a/arch/unicore32/include/asm/uaccess.h b/arch/unicore32/include/asm/uaccess.h
index f60fab718b59fe48ae4637852a70ca638a9c340d..1196c88c2f9b93418f20d1d563962e1a50650e08 100644 (file)
--- a/arch/unicore32/include/asm/uaccess.h
+++ b/arch/unicore32/include/asm/uaccess.h
@@ -20,7 +20,7 @@
 #define __strnlen_user         __strnlen_user
 #define __clear_user           __clear_user
 
-#define __kernel_ok            (segment_eq(get_fs(), KERNEL_DS))
+#define __kernel_ok            (uaccess_kernel())
 #define __user_ok(addr, size)  (((size) <= TASK_SIZE)                  \
                                && ((addr) <= TASK_SIZE - (size)))
 #define __access_ok(addr, size)        (__kernel_ok || __user_ok((addr), (size)))

diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
index d22c1dc7e39e9b6a96c97349c540f17468c788ee..ddaf78ae6854d7d799441d28c788e5fe02199dcd 100644 (file)
--- a/arch/unicore32/kernel/process.c
+++ b/arch/unicore32/kernel/process.c
@@ -178,7 +178,7 @@ void __show_regs(struct pt_regs *regs)
                buf, interrupts_enabled(regs) ? "n" : "ff",
                fast_interrupts_enabled(regs) ? "n" : "ff",
                processor_modes[processor_mode(regs)],
-               segment_eq(get_fs(), get_ds()) ? "kernel" : "user");
+               uaccess_kernel() ? "kernel" : "user");
        {
                unsigned int ctrl;
 

diff --git a/arch/xtensa/include/asm/uaccess.h b/arch/xtensa/include/asm/uaccess.h
index bd8861c811ef1614879a300b5b858c841cff1a65..26512692e28f7fa4ae33ba0d3568072ccf6d0dd6 100644 (file)
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h
@@ -37,7 +37,7 @@
 
 #define segment_eq(a, b)       ((a).seg == (b).seg)
 
-#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
+#define __kernel_ok (uaccess_kernel())
 #define __user_ok(addr, size) \
                (((size) <= TASK_SIZE)&&((addr) <= TASK_SIZE-(size)))
 #define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size)))

diff --git a/block/bsg.c b/block/bsg.c
index 74835dbf0c47c3fc1c6f2f80c9da53ee112402da..69ccb7801a7575b5ca8357dc64fa429c03d6e5de 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -650,7 +650,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 
        dprintk("%s: write %zd bytes\n", bd->name, count);
 
-       if (unlikely(segment_eq(get_fs(), KERNEL_DS)))
+       if (unlikely(uaccess_kernel()))
                return -EINVAL;
 
        bsg_set_block(bd, file);

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 29b86505f796d9fa57c19b958c1c7ae4ef31b298..5d9136a345ececc3e662eb3776cd838d28b69139 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -581,7 +581,7 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
        sg_io_hdr_t *hp;
        unsigned char cmnd[SG_MAX_CDB_SIZE];
 
-       if (unlikely(segment_eq(get_fs(), KERNEL_DS)))
+       if (unlikely(uaccess_kernel()))
                return -EINVAL;
 
        if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))

diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index b786ca2419b4fc42120c3c18bb6d22c7a3a2fb13..9c3ae8706e9dd1f4f81c518f7352593d3be9af50 100644 (file)
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -7,6 +7,8 @@
 #define VERIFY_READ 0
 #define VERIFY_WRITE 1
 
+#define uaccess_kernel() segment_eq(get_fs(), KERNEL_DS)
+
 #include <asm/uaccess.h>
 
 static __always_inline void pagefault_disabled_inc(void)

diff --git a/include/rdma/ib.h b/include/rdma/ib.h
index 9b4c22a36931884520b4b25e42d3b99c2bd8b733..66dbed0c146d290fb86bd0c14abcdb37945b530f 100644 (file)
--- a/include/rdma/ib.h
+++ b/include/rdma/ib.h
@@ -100,7 +100,7 @@ struct sockaddr_ib {
  */
 static inline bool ib_safe_file_access(struct file *filp)
 {
-       return filp->f_cred == current_cred() && segment_eq(get_fs(), USER_DS);
+       return filp->f_cred == current_cred() && !uaccess_kernel();
 }
 
 #endif /* _RDMA_IB_H */

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index cee9802cf3e00f0f5ef1625df14fa9d6892b3581..f806dbd66de9b0445a5caf5ad4af1c24b7ed1b26 100644 (file)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -96,7 +96,7 @@ BPF_CALL_3(bpf_probe_write_user, void *, unsafe_ptr, const void *, src,
        if (unlikely(in_interrupt() ||
                     current->flags & (PF_KTHREAD | PF_EXITING)))
                return -EPERM;
-       if (unlikely(segment_eq(get_fs(), KERNEL_DS)))
+       if (unlikely(uaccess_kernel()))
                return -EPERM;
        if (!access_ok(VERIFY_WRITE, unsafe_ptr, size))
                return -EPERM;

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index e68604ae3cedf41ce98bc06de2142629fa115cbd..97db876c6862578d1aca5036fa4be2c602f83d5f 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -413,7 +413,7 @@ void iov_iter_init(struct iov_iter *i, int direction,
                        size_t count)
 {
        /* It will get better.  Eventually... */
-       if (segment_eq(get_fs(), KERNEL_DS)) {
+       if (uaccess_kernel()) {
                direction |= ITER_KVEC;
                i->type = direction;
                i->kvec = (struct kvec *)iov;

diff --git a/mm/memory.c b/mm/memory.c
index a97a4cec2e1fcd94c5e1eb5f1af334749efe64fa..e8f4e10e770a0a1343d54565800e12e773fb9288 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4136,7 +4136,7 @@ void __might_fault(const char *file, int line)
         * get paged out, therefore we'll never actually fault, and the
         * below annotations will generate false positives.
         */
-       if (segment_eq(get_fs(), KERNEL_DS))
+       if (uaccess_kernel())
                return;
        if (pagefault_disabled())
                return;

diff --git a/security/tomoyo/network.c b/security/tomoyo/network.c
index 97527710a72a5bd41679337c59d82c87b44928a9..6c02ac4782477f35c8a79c3289714d3e503cd31d 100644 (file)
--- a/security/tomoyo/network.c
+++ b/security/tomoyo/network.c
@@ -608,7 +608,7 @@ static int tomoyo_check_unix_address(struct sockaddr *addr,
 static bool tomoyo_kernel_service(void)
 {
        /* Nothing to do if I am a kernel service. */
-       return segment_eq(get_fs(), KERNEL_DS);
+       return uaccess_kernel();
 }
 
 /**