diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-03-28 11:59:24 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-03-28 11:59:24 +0100 |
| commit | cf226c42b2d66b0f60d18fc2e44e68091fee6cef (patch) | |
| tree | 6dae196f26ef862349481dc6fed875e42ded4fb4 /arch/arm/include | |
| parent | m68knommu: Remove mm.h include from uaccess_no.h (diff) | |
| parent | x86: get rid of user_atomic_cmpxchg_inatomic() (diff) | |
| download | linux-dev-cf226c42b2d66b0f60d18fc2e44e68091fee6cef.tar.xz linux-dev-cf226c42b2d66b0f60d18fc2e44e68091fee6cef.zip | |
Merge branch 'uaccess.futex' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into locking/core
Pull uaccess futex cleanups for Al Viro:
Consolidate access_ok() usage and the futex uaccess function zoo.
Diffstat (limited to 'arch/arm/include')
| -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 |