summaryrefslogtreecommitdiff
path: root/arch/riscv
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-03-28 11:59:24 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-03-28 11:59:24 +0100
commitcf226c42b2d66b0f60d18fc2e44e68091fee6cef (patch)
tree6dae196f26ef862349481dc6fed875e42ded4fb4 /arch/riscv
parent9e860351550b28901a78f122b1e2dc97f78ba369 (diff)
parentf5544ba712afd1b01dd856c7eecfb5d30beaf920 (diff)
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/riscv')
-rw-r--r--arch/riscv/include/asm/futex.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index fdfaf7f3df7c..1b00badb9f87 100644
--- 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;