diff options
author | 2020-02-16 10:17:27 -0500 | |
---|---|---|
committer | 2020-03-27 23:58:51 -0400 | |
commit | a08971e9488d12a10a46eb433612229767b61fd5 (patch) | |
tree | fa60afbc9e43a5a84856f61e2b0c9813d9f4a210 /arch/arm | |
parent | Linux 5.6-rc1 (diff) | |
download | linux-a08971e9488d12a10a46eb433612229767b61fd5.tar.gz linux-a08971e9488d12a10a46eb433612229767b61fd5.tar.bz2 linux-a08971e9488d12a10a46eb433612229767b61fd5.zip |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/futex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h index 83c391b597d4..e133da303a98 100644 --- 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 |