futex: arch_futex_atomic_op_inuser() calling conventions change

Move access_ok() in and pagefault_enable()/pagefault_disable() out.
Mechanical conversion only - some instances don't really need
a separate access_ok() at all (e.g. the ones only using
get_user()/put_user(), or architectures where access_ok()
is always true); we'll deal with that in followups.

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

diff --git a/arch/alpha/include/asm/futex.h b/arch/alpha/include/asm/futex.h
index bfd3c01038f83bac87462029595c7d502bb123d3..da67afd578fd17cdb280e00596b913149bc2477e 100644 (file)
--- a/arch/alpha/include/asm/futex.h
+++ b/arch/alpha/include/asm/futex.h
@@ -31,7 +31,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 {
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -53,8 +54,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/arc/include/asm/futex.h b/arch/arc/include/asm/futex.h
index 9d0d070e6c22a2d29628cb80a49c5e5e53504f69..607d1c16d4dd7732917d954f71085797dc539b32 100644 (file)
--- a/arch/arc/include/asm/futex.h
+++ b/arch/arc/include/asm/futex.h
@@ -75,10 +75,12 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 {
        int oldval = 0, ret;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
+
 #ifndef CONFIG_ARC_HAS_LLSC
        preempt_disable();      /* to guarantee atomic r-m-w of futex op */
 #endif
-       pagefault_disable();
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -101,7 +103,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
 #ifndef CONFIG_ARC_HAS_LLSC
        preempt_enable();
 #endif

diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
index 83c391b597d45f82f107ac55103bf80b52b8045a..e133da303a988b6235f4f60be24025c91f7af340 100644 (file)
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
@@ -134,10 +134,12 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret, tmp;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
+
 #ifndef CONFIG_SMP
        preempt_disable();
 #endif
-       pagefault_disable();
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -159,7 +161,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
 #ifndef CONFIG_SMP
        preempt_enable();
 #endif

diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h
index 6cc26a1278197a60d8f275a3b3ba0df7aba0a265..97f6a63810ecbf7a8d803b6eaaba3b4884a2bd3f 100644 (file)
--- a/arch/arm64/include/asm/futex.h
+++ b/arch/arm64/include/asm/futex.h
@@ -48,7 +48,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)
        int oldval = 0, ret, tmp;
        u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);
 
-       pagefault_disable();
+       if (!access_ok(_uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -75,8 +76,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/hexagon/include/asm/futex.h b/arch/hexagon/include/asm/futex.h
index 0191f7c7193e6bd2a8700d2813627b60a701a419..6b9c554aee78e8be81c749fc35ddaaae1a7432a6 100644 (file)
--- a/arch/hexagon/include/asm/futex.h
+++ b/arch/hexagon/include/asm/futex.h
@@ -36,7 +36,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -62,8 +63,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/ia64/include/asm/futex.h b/arch/ia64/include/asm/futex.h
index 2e106d46219650bd8093c1100279aff3a73c7e2a..1db26b432d8c146f6229ba7334ec9a19f2cd935f 100644 (file)
--- a/arch/ia64/include/asm/futex.h
+++ b/arch/ia64/include/asm/futex.h
@@ -50,7 +50,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -74,8 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h
index 8c90357e59831230afd31893ee7afe792fc1f832..86131ed84c9ac9ca34c487943633a0d8de61825f 100644 (file)
--- a/arch/microblaze/include/asm/futex.h
+++ b/arch/microblaze/include/asm/futex.h
@@ -34,7 +34,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -56,8 +57,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/mips/include/asm/futex.h b/arch/mips/include/asm/futex.h
index 110220705e978d76d7b6ef7f43633645c92e0aee..2bf8f6014579896130346c017e68fdac88288926 100644 (file)
--- a/arch/mips/include/asm/futex.h
+++ b/arch/mips/include/asm/futex.h
@@ -89,7 +89,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -116,8 +117,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/nds32/include/asm/futex.h b/arch/nds32/include/asm/futex.h
index 5213c65c2e0b36e0f28df249061f153aee3a96f6..4223f473bd369f0def67df2a05e5a5d856ac7841 100644 (file)
--- a/arch/nds32/include/asm/futex.h
+++ b/arch/nds32/include/asm/futex.h
@@ -66,8 +66,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret;
 
-
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
        switch (op) {
        case FUTEX_OP_SET:
                __futex_atomic_op("move %0, %3", ret, oldval, tmp, uaddr,
@@ -93,8 +93,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/openrisc/include/asm/futex.h b/arch/openrisc/include/asm/futex.h
index fe894e6331aedb7c517eba144318494ab3ac623a..865e9cd0d97b2da254212f31f3e7b309f05a1148 100644 (file)
--- a/arch/openrisc/include/asm/futex.h
+++ b/arch/openrisc/include/asm/futex.h
@@ -35,7 +35,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -57,8 +58,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/parisc/include/asm/futex.h b/arch/parisc/include/asm/futex.h
index d2c3e410685188d24d54263f08c3c7c35c154053..c10cc9010cc198fcb3bab9871457cb0a4292606b 100644 (file)
--- a/arch/parisc/include/asm/futex.h
+++ b/arch/parisc/include/asm/futex.h
@@ -39,8 +39,10 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
        int oldval, ret;
        u32 tmp;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
+
        _futex_spin_lock_irqsave(uaddr, &flags);
-       pagefault_disable();
 
        ret = -EFAULT;
        if (unlikely(get_user(oldval, uaddr) != 0))
@@ -73,7 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -EFAULT;
 
 out_pagefault_enable:
-       pagefault_enable();
        _futex_spin_unlock_irqrestore(uaddr, &flags);
 
        if (!ret)

diff --git a/arch/powerpc/include/asm/futex.h b/arch/powerpc/include/asm/futex.h
index bc7d9d06a6d9dedd1ac313a77f969e8c2985f7c0..f187bb5e524e17b68293455d8b4574b5bf270735 100644 (file)
--- a/arch/powerpc/include/asm/futex.h
+++ b/arch/powerpc/include/asm/futex.h
@@ -35,8 +35,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 {
        int oldval = 0, ret;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
        allow_read_write_user(uaddr, uaddr, sizeof(*uaddr));
-       pagefault_disable();
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -58,8 +59,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        *oval = oldval;
 
        prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr));

diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index fdfaf7f3df7cf11503cb5038bf7b42fb83801699..1b00badb9f871bd5f0be3ccf6e4ab09d2f08d289 100644 (file)
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -46,7 +46,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
        int oldval = 0, ret = 0;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -73,8 +74,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/s390/include/asm/futex.h b/arch/s390/include/asm/futex.h
index 5e97a43531470d13b63b7e4379a95d741363ebb7..ed965c3ecd5b46e170112369dd0908d8addb32ad 100644 (file)
--- a/arch/s390/include/asm/futex.h
+++ b/arch/s390/include/asm/futex.h
@@ -28,8 +28,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
        int oldval = 0, newval, ret;
        mm_segment_t old_fs;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
        old_fs = enable_sacf_uaccess();
-       pagefault_disable();
        switch (op) {
        case FUTEX_OP_SET:
                __futex_atomic_op("lr %2,%5\n",
@@ -54,7 +55,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
        default:
                ret = -ENOSYS;
        }
-       pagefault_enable();
        disable_sacf_uaccess(old_fs);
 
        if (!ret)

diff --git a/arch/sh/include/asm/futex.h b/arch/sh/include/asm/futex.h
index 3190ec89df81c3b41597fc7fbec032d2b5de7ba8..324fa680b13dc607aa7bc77f6acf1e9632034def 100644 (file)
--- a/arch/sh/include/asm/futex.h
+++ b/arch/sh/include/asm/futex.h
@@ -34,7 +34,8 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,
        u32 oldval, newval, prev;
        int ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        do {
                ret = get_user(oldval, uaddr);
@@ -67,8 +68,6 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,
                ret = futex_atomic_cmpxchg_inatomic(&prev, uaddr, oldval, newval);
        } while (!ret && prev != oldval);
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/sparc/include/asm/futex_64.h b/arch/sparc/include/asm/futex_64.h
index 0865ce77ec0085e4b3d751a34db89ffc5bc8ee29..84fffaaf59d3ab4e4797f987b5c15938cdc64821 100644 (file)
--- a/arch/sparc/include/asm/futex_64.h
+++ b/arch/sparc/include/asm/futex_64.h
@@ -35,11 +35,11 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 {
        int oldval = 0, ret, tem;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
        if (unlikely((((unsigned long) uaddr) & 0x3UL)))
                return -EINVAL;
 
-       pagefault_disable();
-
        switch (op) {
        case FUTEX_OP_SET:
                __futex_cas_op("mov\t%4, %1", ret, oldval, uaddr, oparg);
@@ -60,8 +60,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
index 13c83fe97988b6ab9af6cdcca17668b346a33abe..6bcd1c1486d9c348e9a9d33f57c79f58bb359886 100644 (file)
--- a/arch/x86/include/asm/futex.h
+++ b/arch/x86/include/asm/futex.h
@@ -47,7 +47,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 {
        int oldval = 0, ret, tem;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -70,8 +71,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/arch/xtensa/include/asm/futex.h b/arch/xtensa/include/asm/futex.h
index 964611083224a109218bb9ae71cdfd81dc01237d..a1a27b2ea4608522160a1ec5653740fa62d9cb54 100644 (file)
--- a/arch/xtensa/include/asm/futex.h
+++ b/arch/xtensa/include/asm/futex.h
@@ -72,7 +72,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 #if XCHAL_HAVE_S32C1I || XCHAL_HAVE_EXCLUSIVE
        int oldval = 0, ret;
 
-       pagefault_disable();
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
 
        switch (op) {
        case FUTEX_OP_SET:
@@ -99,8 +100,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
                ret = -ENOSYS;
        }
 
-       pagefault_enable();
-
        if (!ret)
                *oval = oldval;
 

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 02970b11f71f47b5e2ef93853d24587af530e702..3eab7ba912fcb288622e62fd1378b932ed7cc86c 100644 (file)
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -33,8 +33,9 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr)
        int oldval, ret;
        u32 tmp;
 
+       if (!access_ok(uaddr, sizeof(u32)))
+               return -EFAULT;
        preempt_disable();
-       pagefault_disable();
 
        ret = -EFAULT;
        if (unlikely(get_user(oldval, uaddr) != 0))
@@ -67,7 +68,6 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr)
                ret = -EFAULT;
 
 out_pagefault_enable:
-       pagefault_enable();
        preempt_enable();
 
        if (ret == 0)

diff --git a/kernel/futex.c b/kernel/futex.c
index 0cf84c8664f207c574325b899ef2e57f01295a94..7fdd2c9494878b6a91221ae5e1fe7cbc74d8027c 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1723,10 +1723,9 @@ static int futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr)
                oparg = 1 << oparg;
        }
 
-       if (!access_ok(uaddr, sizeof(u32)))
-               return -EFAULT;
-
+       pagefault_disable();
        ret = arch_futex_atomic_op_inuser(op, oparg, &oldval, uaddr);
+       pagefault_enable();
        if (ret)
                return ret;