summaryrefslogtreecommitdiff
path: root/kernel
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 /kernel
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 'kernel')
-rw-r--r--kernel/futex.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index b62cf942e4b7..23bc277ef6f6 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1665,10 +1665,9 @@ static int futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr)
oparg = 1 << oparg;
}
- if (!access_ok(uaddr, sizeof(u32)))
- return -EFAULT;
-
+ pagefault_disable();
ret = arch_futex_atomic_op_inuser(op, oparg, &oldval, uaddr);
+ pagefault_enable();
if (ret)
return ret;