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/mips | |
| parent | 9e860351550b28901a78f122b1e2dc97f78ba369 (diff) | |
| parent | f5544ba712afd1b01dd856c7eecfb5d30beaf920 (diff) | |
| download | linux-cf226c42b2d66b0f60d18fc2e44e68091fee6cef.tar.gz | |
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/mips')
| -rw-r--r-- | arch/mips/include/asm/futex.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/include/asm/futex.h b/arch/mips/include/asm/futex.h index 110220705e97..2bf8f6014579 100644 --- 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; |