diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-20 21:08:07 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-28 16:43:25 -0400 |
| commit | db68ce10c4f0a27c1ff9fa0e789e5c41f8c4ea63 (patch) | |
| tree | 77eda1d247853a2d414e0047c620b3c72bb11a1a /arch/parisc | |
| parent | aaa2e7ac80f679230faf28a8e12e8d68dbe977eb (diff) | |
| download | linux-db68ce10c4f0a27c1ff9fa0e789e5c41f8c4ea63.tar.bz2 | |
new helper: uaccess_kernel()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/futex.h | 2 | ||||
| -rw-r--r-- | arch/parisc/lib/memcpy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/futex.h b/arch/parisc/include/asm/futex.h index ac8bd586ace8..0ba14300cd8e 100644 --- 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 f82ff10ed974..66f5160136c2 100644 --- 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) ({ \ |