Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-08 15:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

futex: arch_futex_atomic_op_inuser() calling conventions change

Browse Source 
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>
This commit is contained in:
Al Viro 2020-02-16 10:17:27 -05:00
parent bb6d3fb354
commit a08971e948
20 changed files with 43 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/alpha/include/asm/futex.h
View File

@ -31,7 +31,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
{ {
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -53,8 +54,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/arc/include/asm/futex.h
View File

@ -75,10 +75,12 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
{ {
int oldval = 0, ret; int oldval = 0, ret;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
#ifndef CONFIG_ARC_HAS_LLSC #ifndef CONFIG_ARC_HAS_LLSC
preempt_disable(); /* to guarantee atomic r-m-w of futex op */ preempt_disable(); /* to guarantee atomic r-m-w of futex op */
#endif #endif
pagefault_disable();
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -101,7 +103,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
#ifndef CONFIG_ARC_HAS_LLSC #ifndef CONFIG_ARC_HAS_LLSC
preempt_enable(); preempt_enable();
#endif #endif

5
arch/arm/include/asm/futex.h
View File

@ -134,10 +134,12 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret, tmp; int oldval = 0, ret, tmp;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
preempt_disable(); preempt_disable();
#endif #endif
pagefault_disable();
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -159,7 +161,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
preempt_enable(); preempt_enable();
#endif #endif

5
arch/arm64/include/asm/futex.h
View File

@ -48,7 +48,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)
int oldval = 0, ret, tmp; int oldval = 0, ret, tmp;
u32 __user *uaddr = __uaccess_mask_ptr(_uaddr); u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);
pagefault_disable(); if (!access_ok(_uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -75,8 +76,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/hexagon/include/asm/futex.h
View File

@ -36,7 +36,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -62,8 +63,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/ia64/include/asm/futex.h
View File

@ -50,7 +50,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -74,8 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/microblaze/include/asm/futex.h
View File

@ -34,7 +34,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -56,8 +57,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/mips/include/asm/futex.h
View File

@ -89,7 +89,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -116,8 +117,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

6
arch/nds32/include/asm/futex.h
View File

@ -66,8 +66,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret; int oldval = 0, ret;
if (!access_ok(uaddr, sizeof(u32)))
pagefault_disable(); return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
__futex_atomic_op("move %0, %3", ret, oldval, tmp, uaddr, __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; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/openrisc/include/asm/futex.h
View File

@ -35,7 +35,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -57,8 +58,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/parisc/include/asm/futex.h
View File

@ -39,8 +39,10 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
int oldval, ret; int oldval, ret;
u32 tmp; u32 tmp;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
_futex_spin_lock_irqsave(uaddr, &flags); _futex_spin_lock_irqsave(uaddr, &flags);
pagefault_disable();
ret = -EFAULT; ret = -EFAULT;
if (unlikely(get_user(oldval, uaddr) != 0)) 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; ret = -EFAULT;
out_pagefault_enable: out_pagefault_enable:
pagefault_enable();
_futex_spin_unlock_irqrestore(uaddr, &flags); _futex_spin_unlock_irqrestore(uaddr, &flags);
if (!ret) if (!ret)

5
arch/powerpc/include/asm/futex.h
View File

@ -35,8 +35,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
{ {
int oldval = 0, ret; int oldval = 0, ret;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
allow_read_write_user(uaddr, uaddr, sizeof(*uaddr)); allow_read_write_user(uaddr, uaddr, sizeof(*uaddr));
pagefault_disable();
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -58,8 +59,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
*oval = oldval; *oval = oldval;
prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr)); prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr));

5
arch/riscv/include/asm/futex.h
View File

@ -46,7 +46,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
{ {
int oldval = 0, ret = 0; int oldval = 0, ret = 0;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -73,8 +74,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

4
arch/s390/include/asm/futex.h
View File

@ -28,8 +28,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
int oldval = 0, newval, ret; int oldval = 0, newval, ret;
mm_segment_t old_fs; mm_segment_t old_fs;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
old_fs = enable_sacf_uaccess(); old_fs = enable_sacf_uaccess();
pagefault_disable();
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
__futex_atomic_op("lr %2,%5\n", __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: default:
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
disable_sacf_uaccess(old_fs); disable_sacf_uaccess(old_fs);
if (!ret) if (!ret)

5
arch/sh/include/asm/futex.h
View File

@ -34,7 +34,8 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,
u32 oldval, newval, prev; u32 oldval, newval, prev;
int ret; int ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
do { do {
ret = get_user(oldval, uaddr); 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); ret = futex_atomic_cmpxchg_inatomic(&prev, uaddr, oldval, newval);
} while (!ret && prev != oldval); } while (!ret && prev != oldval);
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

6
arch/sparc/include/asm/futex_64.h
View File

@ -35,11 +35,11 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
{ {
int oldval = 0, ret, tem; int oldval = 0, ret, tem;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
if (unlikely((((unsigned long) uaddr) & 0x3UL))) if (unlikely((((unsigned long) uaddr) & 0x3UL)))
return -EINVAL; return -EINVAL;
pagefault_disable();
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
__futex_cas_op("mov\t%4, %1", ret, oldval, uaddr, oparg); __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; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/x86/include/asm/futex.h
View File

@ -47,7 +47,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
{ {
int oldval = 0, ret, tem; int oldval = 0, ret, tem;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -70,8 +71,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

5
arch/xtensa/include/asm/futex.h
View File

@ -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 #if XCHAL_HAVE_S32C1I || XCHAL_HAVE_EXCLUSIVE
int oldval = 0, ret; int oldval = 0, ret;
pagefault_disable(); if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
switch (op) { switch (op) {
case FUTEX_OP_SET: case FUTEX_OP_SET:
@ -99,8 +100,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
ret = -ENOSYS; ret = -ENOSYS;
} }
pagefault_enable();
if (!ret) if (!ret)
*oval = oldval; *oval = oldval;

4
include/asm-generic/futex.h
View File

@ -33,8 +33,9 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr)
int oldval, ret; int oldval, ret;
u32 tmp; u32 tmp;
if (!access_ok(uaddr, sizeof(u32)))
return -EFAULT;
preempt_disable(); preempt_disable();
pagefault_disable();
ret = -EFAULT; ret = -EFAULT;
if (unlikely(get_user(oldval, uaddr) != 0)) 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; ret = -EFAULT;
out_pagefault_enable: out_pagefault_enable:
pagefault_enable();
preempt_enable(); preempt_enable();
if (ret == 0) if (ret == 0)

5
kernel/futex.c
View File

@ -1723,10 +1723,9 @@ static int futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr)
oparg = 1 << oparg; oparg = 1 << oparg;
} }
if (!access_ok(uaddr, sizeof(u32))) pagefault_disable();
return -EFAULT;
ret = arch_futex_atomic_op_inuser(op, oparg, &oldval, uaddr); ret = arch_futex_atomic_op_inuser(op, oparg, &oldval, uaddr);
pagefault_enable();
if (ret) if (ret)
return ret; return ret;