mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
96d4f267e4
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
106 lines
2.2 KiB
C
106 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __ASM_OPENRISC_FUTEX_H
|
|
#define __ASM_OPENRISC_FUTEX_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/futex.h>
|
|
#include <linux/uaccess.h>
|
|
#include <asm/errno.h>
|
|
|
|
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
|
|
({ \
|
|
__asm__ __volatile__ ( \
|
|
"1: l.lwa %0, %2 \n" \
|
|
insn "\n" \
|
|
"2: l.swa %2, %1 \n" \
|
|
" l.bnf 1b \n" \
|
|
" l.ori %1, r0, 0 \n" \
|
|
"3: \n" \
|
|
".section .fixup,\"ax\" \n" \
|
|
"4: l.j 3b \n" \
|
|
" l.addi %1, r0, %3 \n" \
|
|
".previous \n" \
|
|
".section __ex_table,\"a\" \n" \
|
|
".word 1b,4b,2b,4b \n" \
|
|
".previous \n" \
|
|
: "=&r" (oldval), "=&r" (ret), "+m" (*uaddr) \
|
|
: "i" (-EFAULT), "r" (oparg) \
|
|
: "cc", "memory" \
|
|
); \
|
|
})
|
|
|
|
static inline int
|
|
arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
|
|
{
|
|
int oldval = 0, ret;
|
|
|
|
pagefault_disable();
|
|
|
|
switch (op) {
|
|
case FUTEX_OP_SET:
|
|
__futex_atomic_op("l.or %1,%4,%4", ret, oldval, uaddr, oparg);
|
|
break;
|
|
case FUTEX_OP_ADD:
|
|
__futex_atomic_op("l.add %1,%0,%4", ret, oldval, uaddr, oparg);
|
|
break;
|
|
case FUTEX_OP_OR:
|
|
__futex_atomic_op("l.or %1,%0,%4", ret, oldval, uaddr, oparg);
|
|
break;
|
|
case FUTEX_OP_ANDN:
|
|
__futex_atomic_op("l.and %1,%0,%4", ret, oldval, uaddr, ~oparg);
|
|
break;
|
|
case FUTEX_OP_XOR:
|
|
__futex_atomic_op("l.xor %1,%0,%4", ret, oldval, uaddr, oparg);
|
|
break;
|
|
default:
|
|
ret = -ENOSYS;
|
|
}
|
|
|
|
pagefault_enable();
|
|
|
|
if (!ret)
|
|
*oval = oldval;
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int
|
|
futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
|
|
u32 oldval, u32 newval)
|
|
{
|
|
int ret = 0;
|
|
u32 prev;
|
|
|
|
if (!access_ok(uaddr, sizeof(u32)))
|
|
return -EFAULT;
|
|
|
|
__asm__ __volatile__ ( \
|
|
"1: l.lwa %1, %2 \n" \
|
|
" l.sfeq %1, %3 \n" \
|
|
" l.bnf 3f \n" \
|
|
" l.nop \n" \
|
|
"2: l.swa %2, %4 \n" \
|
|
" l.bnf 1b \n" \
|
|
" l.nop \n" \
|
|
"3: \n" \
|
|
".section .fixup,\"ax\" \n" \
|
|
"4: l.j 3b \n" \
|
|
" l.addi %0, r0, %5 \n" \
|
|
".previous \n" \
|
|
".section __ex_table,\"a\" \n" \
|
|
".word 1b,4b,2b,4b \n" \
|
|
".previous \n" \
|
|
: "+r" (ret), "=&r" (prev), "+m" (*uaddr) \
|
|
: "r" (oldval), "r" (newval), "i" (-EFAULT) \
|
|
: "cc", "memory" \
|
|
);
|
|
|
|
*uval = prev;
|
|
return ret;
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* __ASM_OPENRISC_FUTEX_H */
|