diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2020-02-16 10:17:27 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-03-27 23:58:51 -0400 |
| commit | a08971e9488d12a10a46eb433612229767b61fd5 (patch) | |
| tree | fa60afbc9e43a5a84856f61e2b0c9813d9f4a210 /include/asm-generic/futex.h | |
| parent | Linux 5.6-rc1 (diff) | |
| download | wireguard-linux-a08971e9488d12a10a46eb433612229767b61fd5.tar.xz wireguard-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 'include/asm-generic/futex.h')
| -rw-r--r-- | include/asm-generic/futex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h index 02970b11f71f..3eab7ba912fc 100644 --- a/include/asm-generic/futex.h +++ b/include/asm-generic/futex.h @@ -33,8 +33,9 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) int oldval, ret; u32 tmp; + if (!access_ok(uaddr, sizeof(u32))) + return -EFAULT; preempt_disable(); - pagefault_disable(); ret = -EFAULT; if (unlikely(get_user(oldval, uaddr) != 0)) @@ -67,7 +68,6 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) ret = -EFAULT; out_pagefault_enable: - pagefault_enable(); preempt_enable(); if (ret == 0) |