Remove 'type' argument from access_ok() function
Quoted 28 lines · Linus Torvalds
Nobody has actually used the type (
VERIFY_READvsVERIFY_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 oldVERIFY_xyzinterface 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_iovcode 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
Quoted 7 lines
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 <[email protected]>
sparc32_defconfig:
In file included from ./include/linux/kernel.h:10:0,
from ./include/linux/plist.h:78, from ./include/linux/pm_qos.h:8, from kernel/power/qos.c:32:
./include/linux/uaccess.h: In function '_copy_from_user':./arch/sparc/include/asm/uaccess_32.h:43:12: error: 'type' undeclared
... and this is just the very first build I happened to try this morning.
I triggered a complete test run and will send another note when I get the results. I guess 0day will start screaming if it didn't already do so.
Guenter
Quoted 6,537 lines
--- arch/alpha/include/asm/futex.h | 2 +- arch/alpha/include/asm/uaccess.h | 2 +- arch/alpha/kernel/signal.c | 12 +-- arch/alpha/lib/csum_partial_copy.c | 2 +- arch/arc/include/asm/futex.h | 2 +- arch/arc/kernel/process.c | 2 +- arch/arc/kernel/signal.c | 4 +- arch/arm/include/asm/futex.h | 4 +- arch/arm/include/asm/uaccess.h | 4 +- arch/arm/kernel/perf_callchain.c | 2 +- arch/arm/kernel/signal.c | 6 +- arch/arm/kernel/swp_emulate.c | 2 +- arch/arm/kernel/sys_oabi-compat.c | 4 +- arch/arm/kernel/traps.c | 2 +- arch/arm/oprofile/common.c | 2 +- arch/arm64/include/asm/futex.h | 2 +- arch/arm64/include/asm/uaccess.h | 8 +- arch/arm64/kernel/armv8_deprecated.c | 2 +- arch/arm64/kernel/perf_callchain.c | 4 +- arch/arm64/kernel/signal.c | 6 +- arch/arm64/kernel/signal32.c | 6 +- arch/arm64/kernel/sys_compat.c | 2 +- arch/c6x/kernel/signal.c | 4 +- arch/csky/abiv1/alignment.c | 4 +- arch/csky/include/asm/uaccess.h | 16 +--- arch/csky/kernel/signal.c | 2 +- arch/csky/lib/usercopy.c | 8 +- arch/h8300/kernel/signal.c | 4 +- arch/hexagon/include/asm/futex.h | 2 +- arch/hexagon/include/asm/uaccess.h | 3 - arch/hexagon/kernel/signal.c | 4 +- arch/hexagon/mm/uaccess.c | 2 +- arch/ia64/include/asm/futex.h | 2 +- arch/ia64/include/asm/uaccess.h | 2 +- arch/ia64/kernel/ptrace.c | 4 +- arch/ia64/kernel/signal.c | 4 +- arch/m68k/include/asm/uaccess_mm.h | 2 +- arch/m68k/include/asm/uaccess_no.h | 2 +- arch/m68k/kernel/signal.c | 4 +- arch/microblaze/include/asm/futex.h | 2 +- arch/microblaze/include/asm/uaccess.h | 23 +++--- arch/microblaze/kernel/signal.c | 4 +- arch/mips/include/asm/checksum.h | 4 +- arch/mips/include/asm/futex.h | 2 +- arch/mips/include/asm/termios.h | 4 +- arch/mips/include/asm/uaccess.h | 12 +-- arch/mips/kernel/mips-r2-to-r6-emul.c | 24 +++--- arch/mips/kernel/ptrace.c | 12 +-- arch/mips/kernel/signal.c | 12 +-- arch/mips/kernel/signal32.c | 4 +- arch/mips/kernel/signal_n32.c | 4 +- arch/mips/kernel/signal_o32.c | 8 +- arch/mips/kernel/syscall.c | 2 +- arch/mips/kernel/unaligned.c | 98 ++++++++++++------------- arch/mips/math-emu/cp1emu.c | 16 ++-- arch/mips/mm/cache.c | 2 +- arch/mips/mm/gup.c | 3 +- arch/mips/oprofile/backtrace.c | 2 +- arch/mips/sibyte/common/sb_tbprof.c | 2 +- arch/nds32/include/asm/futex.h | 2 +- arch/nds32/include/asm/uaccess.h | 11 +-- arch/nds32/kernel/perf_event_cpu.c | 11 ++- arch/nds32/kernel/signal.c | 4 +- arch/nds32/mm/alignment.c | 8 +- arch/nios2/include/asm/uaccess.h | 8 +- arch/nios2/kernel/signal.c | 2 +- arch/openrisc/include/asm/futex.h | 2 +- arch/openrisc/include/asm/uaccess.h | 8 +- arch/openrisc/kernel/signal.c | 6 +- arch/parisc/include/asm/futex.h | 2 +- arch/parisc/include/asm/uaccess.h | 2 +- arch/powerpc/include/asm/futex.h | 2 +- arch/powerpc/include/asm/uaccess.h | 8 +- arch/powerpc/kernel/align.c | 3 +- arch/powerpc/kernel/rtas_flash.c | 2 +- arch/powerpc/kernel/rtasd.c | 2 +- arch/powerpc/kernel/signal.c | 2 +- arch/powerpc/kernel/signal_32.c | 12 +-- arch/powerpc/kernel/signal_64.c | 13 ++-- arch/powerpc/kernel/syscalls.c | 2 +- arch/powerpc/kernel/traps.c | 2 +- arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- arch/powerpc/lib/checksum_wrappers.c | 4 +- arch/powerpc/mm/fault.c | 2 +- arch/powerpc/mm/subpage-prot.c | 2 +- arch/powerpc/oprofile/backtrace.c | 4 +- arch/powerpc/platforms/cell/spufs/file.c | 16 ++-- arch/powerpc/platforms/powernv/opal-lpc.c | 4 +- arch/powerpc/platforms/pseries/scanlog.c | 2 +- arch/riscv/include/asm/futex.h | 2 +- arch/riscv/include/asm/uaccess.h | 14 +--- arch/riscv/kernel/signal.c | 4 +- arch/s390/include/asm/uaccess.h | 2 +- arch/sh/include/asm/checksum_32.h | 2 +- arch/sh/include/asm/futex.h | 2 +- arch/sh/include/asm/uaccess.h | 9 +-- arch/sh/kernel/signal_32.c | 8 +- arch/sh/kernel/signal_64.c | 8 +- arch/sh/kernel/traps_64.c | 12 +-- arch/sh/mm/gup.c | 3 +- arch/sh/oprofile/backtrace.c | 2 +- arch/sparc/include/asm/checksum_32.h | 2 +- arch/sparc/include/asm/uaccess_32.h | 2 +- arch/sparc/include/asm/uaccess_64.h | 2 +- arch/sparc/kernel/sigutil_32.c | 2 +- arch/sparc/kernel/unaligned_32.c | 7 +- arch/um/kernel/ptrace.c | 4 +- arch/unicore32/kernel/signal.c | 4 +- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- arch/x86/ia32/ia32_aout.c | 4 +- arch/x86/ia32/ia32_signal.c | 8 +- arch/x86/ia32/sys_ia32.c | 2 +- arch/x86/include/asm/checksum_32.h | 2 +- arch/x86/include/asm/pgtable_32.h | 2 +- arch/x86/include/asm/uaccess.h | 7 +- arch/x86/kernel/fpu/signal.c | 4 +- arch/x86/kernel/signal.c | 14 ++-- arch/x86/kernel/stacktrace.c | 2 +- arch/x86/kernel/vm86_32.c | 4 +- arch/x86/lib/csum-wrappers_64.c | 4 +- arch/x86/lib/usercopy_32.c | 2 +- arch/x86/lib/usercopy_64.c | 2 +- arch/x86/math-emu/fpu_system.h | 4 +- arch/x86/math-emu/load_store.c | 6 +- arch/x86/math-emu/reg_ld_str.c | 48 ++++++------ arch/x86/mm/mpx.c | 2 +- arch/x86/um/asm/checksum_32.h | 2 +- arch/x86/um/signal.c | 6 +- arch/xtensa/include/asm/checksum.h | 2 +- arch/xtensa/include/asm/futex.h | 2 +- arch/xtensa/include/asm/uaccess.h | 10 +-- arch/xtensa/kernel/signal.c | 4 +- arch/xtensa/kernel/stacktrace.c | 2 +- drivers/acpi/acpi_dbg.c | 4 +- drivers/char/generic_nvram.c | 4 +- drivers/char/mem.c | 4 +- drivers/char/nwflash.c | 2 +- drivers/char/pcmcia/cm4000_cs.c | 4 +- drivers/crypto/ccp/psp-dev.c | 6 +- drivers/firewire/core-cdev.c | 2 +- drivers/firmware/efi/test/efi_test.c | 8 +- drivers/fpga/dfl-afu-dma-region.c | 2 +- drivers/fpga/dfl-fme-pr.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 ++--- drivers/gpu/drm/armada/armada_gem.c | 2 +- drivers/gpu/drm/drm_file.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +- drivers/gpu/drm/i915/i915_gem.c | 7 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 3 +- drivers/gpu/drm/i915/i915_ioc32.c | 2 +- drivers/gpu/drm/i915/i915_perf.c | 2 +- drivers/gpu/drm/i915/i915_query.c | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/qxl/qxl_ioctl.c | 3 +- drivers/infiniband/core/uverbs_main.c | 3 +- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 2 +- drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- drivers/macintosh/ans-lcd.c | 2 +- drivers/macintosh/via-pmu.c | 2 +- drivers/media/pci/ivtv/ivtvfb.c | 2 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 46 ++++++------ drivers/misc/vmw_vmci/vmci_host.c | 2 +- drivers/pci/proc.c | 4 +- drivers/platform/goldfish/goldfish_pipe.c | 3 +- drivers/pnp/isapnp/proc.c | 2 +- drivers/scsi/pmcraid.c | 4 +- drivers/scsi/scsi_ioctl.c | 2 +- drivers/scsi/sg.c | 16 ++-- drivers/staging/comedi/comedi_compat32.c | 24 +++--- drivers/tty/n_hdlc.c | 2 +- drivers/usb/core/devices.c | 2 +- drivers/usb/core/devio.c | 7 +- drivers/usb/gadget/function/f_hid.c | 4 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- drivers/vhost/vhost.c | 16 ++-- drivers/video/fbdev/amifb.c | 4 +- drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 +- drivers/xen/privcmd.c | 6 +- fs/binfmt_aout.c | 4 +- fs/btrfs/send.c | 2 +- fs/eventpoll.c | 2 +- fs/fat/dir.c | 4 +- fs/ioctl.c | 2 +- fs/namespace.c | 2 +- fs/ocfs2/dlmfs/dlmfs.c | 4 +- fs/pstore/pmsg.c | 2 +- fs/pstore/ram_core.c | 2 +- fs/read_write.c | 13 ++-- fs/readdir.c | 10 +-- fs/select.c | 11 +-- include/asm-generic/uaccess.h | 12 +-- include/linux/regset.h | 4 +- include/linux/uaccess.h | 9 +-- include/net/checksum.h | 4 +- kernel/bpf/syscall.c | 2 +- kernel/compat.c | 16 ++-- kernel/events/core.c | 2 +- kernel/exit.c | 4 +- kernel/futex.c | 35 +++++---- kernel/printk/printk.c | 4 +- kernel/ptrace.c | 4 +- kernel/rseq.c | 6 +- kernel/sched/core.c | 4 +- kernel/signal.c | 8 +- kernel/sys.c | 2 +- kernel/trace/bpf_trace.c | 2 +- lib/bitmap.c | 4 +- lib/iov_iter.c | 8 +- lib/usercopy.c | 4 +- mm/gup.c | 6 +- mm/mincore.c | 4 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/log.c | 2 +- net/compat.c | 30 ++++---- net/sunrpc/sysctl.c | 2 +- security/tomoyo/common.c | 2 +- sound/core/seq/seq_clientmgr.c | 2 +- sound/isa/sb/emu8000_patch.c | 4 +- tools/perf/util/include/asm/uaccess.h | 2 +- virt/kvm/kvm_main.c | 3 +- 221 files changed, 610 insertions(+), 679 deletions(-)arch/alpha/include/asm/futex.h +1
-1@@ -68,7 +68,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret =0 , cmp;u32 prev; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ; __asm__ __volatile__ (arch/alpha/include/asm/uaccess.h +1
-1@@ -36,7 +36,7 @@#define __access_ok (addr, size) \ ((get_fs().seg & (addr | size | (addr+size))) == 0) -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ ({ \ __chk_user_ptr(addr); \ __access_ok(((unsigned long)(addr)), (size)); \arch/alpha/kernel/signal.c +6
-6@@ -65,7 +65,7 @@ SYSCALL_DEFINE3(osf_sigaction, int, sig,if (act) {old_sigset_t mask; -if (!access_ok (VERIFY_READ , act,sizeof (*act)) || +if (!access_ok (act,sizeof (*act)) ||__get_user (new_ka.sa.sa_handler, &act->sa_handler) ||__get_user (new_ka.sa.sa_flags, &act->sa_flags) ||__get_user (mask, &act->sa_mask))@@ -77,7 +77,7 @@ SYSCALL_DEFINE3(osf_sigaction, int, sig, ret =do_sigaction (sig, act ? &new_ka :NULL , oact ? &old_ka :NULL );if (!ret && oact) { -if (!access_ok (VERIFY_WRITE , oact,sizeof (*oact)) || +if (!access_ok (oact,sizeof (*oact)) ||__put_user (old_ka.sa.sa_handler, &oact->sa_handler) ||__put_user (old_ka.sa.sa_flags, &oact->sa_flags) ||__put_user (old_ka.sa.sa_mask.sig[0 ], &oact->sa_mask))@@ -207,7 +207,7 @@ do_sigreturn(struct sigcontext __user *sc)sigset_t set;/* Verify that it's a good sigcontext before using it */ -if (!access_ok (VERIFY_READ , sc,sizeof (*sc))) +if (!access_ok (sc,sizeof (*sc))) goto give_sigsegv;if (__get_user (set.sig[0 ], &sc->sc_mask)) goto give_sigsegv;@@ -235,7 +235,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame)sigset_t set;/* Verify that it's a good ucontext_t before using it */ -if (!access_ok (VERIFY_READ , &frame->uc,sizeof (frame->uc))) +if (!access_ok (&frame->uc,sizeof (frame->uc))) goto give_sigsegv;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto give_sigsegv;@@ -332,7 +332,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) oldsp =rdusp (); frame =get_sigframe (ksig, oldsp,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=setup_sigcontext (&frame->sc, regs, set->sig[0 ], oldsp);@@ -377,7 +377,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) oldsp =rdusp (); frame =get_sigframe (ksig, oldsp,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=copy_siginfo_to_user (&frame->info, &ksig->info);arch/alpha/lib/csum_partial_copy.c +1
-1@@ -333,7 +333,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,unsigned long doff =7 & (unsigned long ) dst;if (len) { -if (!access_ok (VERIFY_READ , src, len)) { +if (!access_ok (src, len)) {if (errp) *errp = -EFAULT ;memset (dst,0 , len);return sum;arch/arc/include/asm/futex.h +1
-1@@ -126,7 +126,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 expval,int ret =0 ;u32 existval; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;#ifndef CONFIG_ARC_HAS_LLSC arch/arc/kernel/process.c +1
-1@@ -61,7 +61,7 @@ SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)/* Z indicates to userspace if operation succeded */ regs->status32 &= ~STATUS_Z_MASK ; - ret =access_ok (VERIFY_WRITE , uaddr,sizeof (*uaddr)); + ret =access_ok (uaddr,sizeof (*uaddr));if (!ret) goto fail;arch/arc/kernel/signal.c +2
-2@@ -169,7 +169,7 @@ SYSCALL_DEFINE0(rt_sigreturn) sf = (struct rt_sigframe __force __user *)(regs->sp); -if (!access_ok (VERIFY_READ , sf,sizeof (*sf))) +if (!access_ok (sf,sizeof (*sf))) goto badframe;if (__get_user (magic, &sf->sigret_magic))@@ -219,7 +219,7 @@ static inline void __user *get_sigframe(struct ksignal *ksig, frame = (void __user *)((sp - framesize) & ~7 );/* Check that we can actually write to the signal frame */ -if (!access_ok (VERIFY_WRITE , frame, framesize)) +if (!access_ok (frame, framesize)) frame =NULL ;return frame;arch/arm/include/asm/futex.h +2
-2@@ -50,7 +50,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret;u32 val; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;smp_mb ();@@ -104,7 +104,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret =0 ;u32 val; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;preempt_disable ();arch/arm/include/asm/uaccess.h +2
-2@@ -279,7 +279,7 @@ static inline void set_fs(mm_segment_t fs)#endif /* CONFIG_MMU */ -#define access_ok (type, addr, size) (__range_ok(addr, size) == 0) +#define access_ok (addr, size) (__range_ok(addr, size) == 0)#define user_addr_max () \ (uaccess_kernel() ? ~0UL : get_fs())@@ -560,7 +560,7 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)static inline unsigned long __must_check clear_user (void __user *to,unsigned long n) { -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n)) n =__clear_user (to, n);return n; }arch/arm/kernel/perf_callchain.c +1
-1@@ -37,7 +37,7 @@ user_backtrace(struct frame_tail __user *tail,struct frame_tail buftail;unsigned long err; -if (!access_ok (VERIFY_READ , tail,sizeof (buftail))) +if (!access_ok (tail,sizeof (buftail)))return NULL ;pagefault_disable ();arch/arm/kernel/signal.c +3
-3@@ -241,7 +241,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs) frame = (struct sigframe __user *)regs->ARM_sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (restore_sigframe (regs, frame))@@ -271,7 +271,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) frame = (struct rt_sigframe __user *)regs->ARM_sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (restore_sigframe (regs, &frame->sig))@@ -355,7 +355,7 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, int framesize)/* * Check that we can actually write to the signal frame. */ -if (!access_ok (VERIFY_WRITE , frame, framesize)) +if (!access_ok (frame, framesize)) frame =NULL ;return frame;arch/arm/kernel/swp_emulate.c +1
-1@@ -198,7 +198,7 @@ static int swp_handler(struct pt_regs *regs, unsigned int instr) destreg, EXTRACT_REG_NUM(instr, RT2_OFFSET), data);/* Check access in reasonable access range for both SWP and SWPB */ -if (!access_ok (VERIFY_WRITE , (address & ~3 ),4 )) { +if (!access_ok ((address & ~3 ),4 )) {pr_debug ("SWP{B} emulation: access to %p not allowed!\n" , (void *)address); res = -EFAULT ;arch/arm/kernel/sys_oabi-compat.c +2
-2@@ -285,7 +285,7 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, maxevents > (INT_MAX /sizeof (*kbuf)) || maxevents > (INT_MAX/sizeof(*events))) return -EINVAL; -if (!access_ok (VERIFY_WRITE , events,sizeof (*events) * maxevents)) +if (!access_ok (events,sizeof (*events) * maxevents))return -EFAULT ; kbuf =kmalloc_array (maxevents,sizeof (*kbuf),GFP_KERNEL );if (!kbuf)@@ -326,7 +326,7 @@ asmlinkage long sys_oabi_semtimedop(int semid,if (nsops <1 || nsops >SEMOPM )return -EINVAL ; -if (!access_ok (VERIFY_READ , tsops,sizeof (*tsops) * nsops)) +if (!access_ok (tsops,sizeof (*tsops) * nsops))return -EFAULT ; sops =kmalloc_array (nsops,sizeof (*sops),GFP_KERNEL );if (!sops)arch/arm/kernel/traps.c +1
-1@@ -582,7 +582,7 @@ do_cache_op(unsigned long start, unsigned long end, int flags)if (end < start || flags)return -EINVAL ; -if (!access_ok (VERIFY_READ , start, end - start)) +if (!access_ok (start, end - start))return -EFAULT ;return __do_cache_op (start, end);arch/arm/oprofile/common.c +1
-1@@ -88,7 +88,7 @@ static struct frame_tail* user_backtrace(struct frame_tail *tail)struct frame_tail buftail[2 ];/* Also check accessibility of one struct frame_tail beyond */ -if (!access_ok (VERIFY_READ , tail,sizeof (buftail))) +if (!access_ok (tail,sizeof (buftail)))return NULL ;if (__copy_from_user_inatomic (buftail, tail,sizeof (buftail)))return NULL ;arch/arm64/include/asm/futex.h +1
-1@@ -96,7 +96,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr,u32 val, tmp;u32 __user *uaddr; -if (!access_ok (VERIFY_WRITE , _uaddr,sizeof (u32))) +if (!access_ok (_uaddr,sizeof (u32)))return -EFAULT ; uaddr =__uaccess_mask_ptr (_uaddr);arch/arm64/include/asm/uaccess.h +4
-4@@ -95,7 +95,7 @@ static inline unsigned long __range_ok(const void __user *addr, unsigned long sireturn ret; } -#define access_ok (type, addr, size) __range_ok(addr, size) +#define access_ok (addr, size) __range_ok(addr, size)#define user_addr_max get_fs#define _ASM_EXTABLE (from, to) \@@ -301,7 +301,7 @@ do { \ ({ \ __typeof__(*(ptr)) __user *__p = (ptr); \ might_fault(); \ - if (access_ok(VERIFY_READ, __p, sizeof(*__p))) { \ + if (access_ok(__p, sizeof(*__p))) { \ __p = uaccess_mask_ptr(__p); \ __get_user_err((x), __p, (err)); \ } else { \@@ -370,7 +370,7 @@ do { \ ({ \ __typeof__(*(ptr)) __user *__p = (ptr); \ might_fault(); \ - if (access_ok(VERIFY_WRITE, __p, sizeof(*__p))) { \ + if (access_ok(__p, sizeof(*__p))) { \ __p = uaccess_mask_ptr(__p); \ __put_user_err((x), __p, (err)); \ } else { \@@ -418,7 +418,7 @@ extern unsigned long __must_check __arch_copy_in_user(void __user *to, const voiextern unsigned long __must_check __arch_clear_user (void __user *to,unsigned long n);static inline unsigned long __must_check __clear_user (void __user *to,unsigned long n) { -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n)) n =__arch_clear_user (__uaccess_mask_ptr (to), n);return n; }arch/arm64/kernel/armv8_deprecated.c +1
-1@@ -402,7 +402,7 @@ static int swp_handler(struct pt_regs *regs, u32 instr)/* Check access in reasonable access range for both SWP and SWPB */ user_ptr = (const void __user *)(unsigned long )(address & ~3 ); -if (!access_ok (VERIFY_WRITE , user_ptr,4 )) { +if (!access_ok (user_ptr,4 )) {pr_debug ("SWP{B} emulation: access to 0x%08x not allowed!\n" , address); goto fault;arch/arm64/kernel/perf_callchain.c +2
-2@@ -39,7 +39,7 @@ user_backtrace(struct frame_tail __user *tail,unsigned long lr;/* Also check accessibility of one struct frame_tail beyond */ -if (!access_ok (VERIFY_READ , tail,sizeof (buftail))) +if (!access_ok (tail,sizeof (buftail)))return NULL ;pagefault_disable ();@@ -86,7 +86,7 @@ compat_user_backtrace(struct compat_frame_tail __user *tail,unsigned long err;/* Also check accessibility of one struct frame_tail beyond */ -if (!access_ok (VERIFY_READ , tail,sizeof (buftail))) +if (!access_ok (tail,sizeof (buftail)))return NULL ;pagefault_disable ();arch/arm64/kernel/signal.c +3
-3@@ -470,7 +470,7 @@ static int parse_user_sigframe(struct user_ctxs *user, offset =0 ; limit = extra_size; -if (!access_ok (VERIFY_READ , base, limit)) +if (!access_ok (base, limit)) goto invalid;continue ;@@ -556,7 +556,7 @@ SYSCALL_DEFINE0(rt_sigreturn) frame = (struct rt_sigframe __user *)regs->sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (restore_sigframe (regs, frame))@@ -730,7 +730,7 @@ static int get_sigframe(struct rt_sigframe_user_layout *user,/* * Check that we can actually write to the signal frame. */ -if (!access_ok (VERIFY_WRITE , user->sigframe, sp_top - sp)) +if (!access_ok (user->sigframe, sp_top - sp))return -EFAULT ;return 0 ;arch/arm64/kernel/signal32.c +3
-3@@ -303,7 +303,7 @@ COMPAT_SYSCALL_DEFINE0(sigreturn) frame = (struct compat_sigframe __user *)regs->compat_sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (compat_restore_sigframe (regs, frame))@@ -334,7 +334,7 @@ COMPAT_SYSCALL_DEFINE0(rt_sigreturn) frame = (struct compat_rt_sigframe __user *)regs->compat_sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (compat_restore_sigframe (regs, &frame->sig))@@ -365,7 +365,7 @@ static void __user *compat_get_sigframe(struct ksignal *ksig,/* * Check that we can actually write to the signal frame. */ -if (!access_ok (VERIFY_WRITE , frame, framesize)) +if (!access_ok (frame, framesize)) frame =NULL ;return frame;arch/arm64/kernel/sys_compat.c +1
-1@@ -58,7 +58,7 @@ do_compat_cache_op(unsigned long start, unsigned long end, int flags)if (end < start || flags)return -EINVAL ; -if (!access_ok (VERIFY_READ , (const void __user *)start, end - start)) +if (!access_ok ((const void __user *)start, end - start))return -EFAULT ;return __do_compat_cache_op (start, end);arch/c6x/kernel/signal.c +2
-2@@ -80,7 +80,7 @@ asmlinkage int do_rt_sigreturn(struct pt_regs *regs) frame = (struct rt_sigframe __user *) ((unsigned long ) regs->sp +8 ); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;@@ -149,7 +149,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=__put_user (&frame->info, &frame->pinfo);arch/csky/abiv1/alignment.c +2
-2@@ -32,7 +32,7 @@ static int ldb_asm(uint32_t addr, uint32_t *valp)uint32_t val;int err; -if (!access_ok (VERIFY_READ , (void *)addr,1 )) +if (!access_ok ((void *)addr,1 ))return 1 ; asm volatile (@@ -67,7 +67,7 @@ static int stb_asm(uint32_t addr, uint32_t val) {int err; -if (!access_ok (VERIFY_WRITE , (void *)addr,1 )) +if (!access_ok ((void *)addr,1 ))return 1 ; asm volatile (arch/csky/include/asm/uaccess.h +4
-12@@ -16,10 +16,7 @@#include <linux/version.h> #include <asm/segment.h> -#define VERIFY_READ 0 -#define VERIFY_WRITE 1 - -static inline int access_ok (int type,const void *addr,unsigned long size) +static inline int access_ok (const void *addr,unsigned long size) {unsigned long limit =current_thread_info ()->addr_limit.seg;@@ -27,12 +24,7 @@ static inline int access_ok(int type, const void *addr, unsigned long size) ((unsigned long)(addr + size) < limit)); } -static inline int verify_area (int type,const void *addr,unsigned long size) -{ -return access_ok (type, addr, size) ?0 : -EFAULT ; -} - -#define __addr_ok (addr) (access_ok(VERIFY_READ, addr, 0)) +#define __addr_ok (addr) (access_ok(addr, 0))extern int __put_user_bad (void );@@ -91,7 +83,7 @@ extern int __put_user_bad(void);long __pu_err = -EFAULT ; \typeof (*(ptr)) *__pu_addr = (ptr); \ typeof(*(ptr)) __pu_val = (typeof(*(ptr)))(x); \ -if (access_ok (VERIFY_WRITE , __pu_addr, size) && __pu_addr) \ +if (access_ok (__pu_addr, size) && __pu_addr) \__put_user_size (__pu_val, __pu_addr, (size), __pu_err); \ __pu_err; \ })@@ -217,7 +209,7 @@ do { \ ({ \int __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -if (access_ok (VERIFY_READ , __gu_ptr, size) && __gu_ptr) \ +if (access_ok (__gu_ptr, size) && __gu_ptr) \__get_user_size (x, __gu_ptr, size, __gu_err); \ __gu_err; \ })arch/csky/kernel/signal.c +1
-1@@ -88,7 +88,7 @@ do_rt_sigreturn(void)struct pt_regs *regs =current_pt_regs ();struct rt_sigframe *frame = (struct rt_sigframe *)(regs->usp); -if (verify_area (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;arch/csky/lib/usercopy.c +4
-4@@ -7,7 +7,7 @@unsigned long raw_copy_from_user (void *to,const void *from,unsigned long n) { -if (access_ok (VERIFY_READ , from, n)) +if (access_ok (from, n))__copy_user_zeroing (to, from, n);else memset (to,0 , n);@@ -18,7 +18,7 @@ EXPORT_SYMBOL(raw_copy_from_user);unsigned long raw_copy_to_user (void *to,const void *from,unsigned long n) { -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n))__copy_user (to, from, n);return n; }@@ -113,7 +113,7 @@ long strncpy_from_user(char *dst, const char *src, long count) {long res = -EFAULT ; -if (access_ok (VERIFY_READ , src,1 )) +if (access_ok (src,1 ))__do_strncpy_from_user (dst, src, count, res);return res; }@@ -236,7 +236,7 @@ do { \unsigned long clear_user (void __user *to,unsigned long n) { -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n))__do_clear_user (to, n);return n; }arch/h8300/kernel/signal.c +2
-2@@ -110,7 +110,7 @@ asmlinkage int sys_rt_sigreturn(void)sigset_t set;int er0; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;@@ -165,7 +165,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;if (ksig->ka.sa.sa_flags &SA_SIGINFO )arch/hexagon/include/asm/futex.h +1
-1@@ -77,7 +77,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval,int prev;int ret; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ; __asm__ __volatile__ (arch/hexagon/include/asm/uaccess.h +0
-3@@ -29,9 +29,6 @@/* * access_ok: - Checks if a user space pointer is valid -* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE. Note that -* %VERIFY_WRITE is a superset of %VERIFY_READ - if it is safe -* to write to a block, it is always safe to read from it. * @addr: User space pointer to start of block to check * @size: Size of block to check * arch/hexagon/kernel/signal.c +2
-2@@ -115,7 +115,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (ksig, regs,sizeof (struct rt_sigframe )); -if (!access_ok (VERIFY_WRITE , frame,sizeof (struct rt_sigframe ))) +if (!access_ok (frame,sizeof (struct rt_sigframe )))return -EFAULT ;if (copy_siginfo_to_user (&frame->info, &ksig->info))@@ -244,7 +244,7 @@ asmlinkage int sys_rt_sigreturn(void) current->restart_block.fn = do_no_restart_syscall; frame = (struct rt_sigframe __user *)pt_psp (regs); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&blocked, &frame->uc.uc_sigmask,sizeof (blocked))) goto badframe;arch/hexagon/mm/uaccess.c +1
-1@@ -51,7 +51,7 @@ __kernel_size_t __clear_user_hexagon(void __user *dest, unsigned long count)unsigned long clear_user_hexagon (void __user *dest,unsigned long count) { -if (!access_ok (VERIFY_WRITE , dest, count)) +if (!access_ok (dest, count))return count;else return __clear_user_hexagon (dest, count);arch/ia64/include/asm/futex.h +1
-1@@ -86,7 +86,7 @@ static inline intfutex_atomic_cmpxchg_inatomic (u32 *uval, u32__user *uaddr, u32 oldval, u32 newval) { -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ; {arch/ia64/include/asm/uaccess.h +1
-1@@ -67,7 +67,7 @@ static inline int __access_ok(const void __user *p, unsigned long size)return likely (addr <= seg) && (seg ==KERNEL_DS .seg ||likely (REGION_OFFSET (addr) <RGN_MAP_LIMIT )); } -#define access_ok (type, addr, size) __access_ok((addr), (size)) +#define access_ok (addr, size) __access_ok((addr), (size))/* * These are the main single-value transfer routines. They automatically arch/ia64/kernel/ptrace.c +2
-2@@ -836,7 +836,7 @@ ptrace_getregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)char nat =0 ;int i; -if (!access_ok (VERIFY_WRITE , ppr,sizeof (struct pt_all_user_regs ))) +if (!access_ok (ppr,sizeof (struct pt_all_user_regs )))return -EIO ; pt =task_pt_regs (child);@@ -981,7 +981,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)memset (&fpval,0 ,sizeof (fpval)); -if (!access_ok (VERIFY_READ , ppr,sizeof (struct pt_all_user_regs ))) +if (!access_ok (ppr,sizeof (struct pt_all_user_regs )))return -EIO ; pt =task_pt_regs (child);arch/ia64/kernel/signal.c +2
-2@@ -132,7 +132,7 @@ ia64_rt_sigreturn (struct sigscratch *scr)*/ retval = (long ) &ia64_strace_leave_kernel; -if (!access_ok (VERIFY_READ , sc,sizeof (*sc))) +if (!access_ok (sc,sizeof (*sc))) goto give_sigsegv;if (GET_SIGSET (&set, &sc->sc_mask))@@ -264,7 +264,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr) } frame = (void __user *) ((new_sp -sizeof (*frame)) & -STACK_ALIGN ); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) { +if (!access_ok (frame,sizeof (*frame))) {force_sigsegv (ksig->sig, current);return 1 ; }arch/m68k/include/asm/uaccess_mm.h +1
-1@@ -10,7 +10,7 @@#include <asm/segment.h> /* We let the MMU do all checking */ -static inline int access_ok (int type,const void __user *addr, +static inline int access_ok (const void __user *addr,unsigned long size) {return 1 ;arch/m68k/include/asm/uaccess_no.h +1
-1@@ -10,7 +10,7 @@#include <asm/segment.h> -#define access_ok (type,addr,size) _access_ok((unsigned long)(addr),(size)) +#define access_ok (addr,size) _access_ok((unsigned long)(addr),(size))/* * It is not enough to just have access_ok check for a real RAM address. arch/m68k/kernel/signal.c +2
-2@@ -787,7 +787,7 @@ asmlinkage int do_sigreturn(struct pt_regs *regs, struct switch_stack *sw)struct sigframe __user *frame = (struct sigframe __user *)(usp -4 );sigset_t set; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe; if (__get_user(set.sig[0], &frame->sc.sc_mask) || (_NSIG_WORDS > 1 &&@@ -812,7 +812,7 @@ asmlinkage int do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw)struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(usp -4 );sigset_t set; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;arch/microblaze/include/asm/futex.h +1
-1@@ -71,7 +71,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret =0 , cmp;u32 prev; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ; __asm__ __volatile__ ("1: lwx %1, %3, r0; \arch/microblaze/include/asm/uaccess.h +11
-12@@ -60,26 +60,25 @@ static inline int ___range_ok(unsigned long addr, unsigned long size)#define __range_ok (addr, size) \ ___range_ok((unsigned long)(addr), (unsigned long)(size)) -#define access_ok (type, addr, size) (__range_ok((addr), (size)) == 0) +#define access_ok (addr, size) (__range_ok((addr), (size)) == 0)#else -static inline int access_ok (int type,const void __user *addr, -unsigned long size) +static inline int access_ok (const void __user *addr,unsigned long size) {if (!size) goto ok;if ((get_fs ().seg < ((unsigned long )addr)) || (get_fs ().seg < ((unsigned long )addr + size -1 ))) { -pr_devel ("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n" , - type ?"WRITE" :"READ " , (__force u32 )addr, (u32 )size, +pr_devel ("ACCESS fail at 0x%08x (size 0x%x), seg 0x%08x\n" , + (__force u32 )addr, (u32 )size, (u32 )get_fs ().seg);return 0 ; } ok: -pr_devel ("ACCESS OK: %s at 0x%08x (size 0x%x), seg 0x%08x\n" , - type ?"WRITE" :"READ " , (__force u32 )addr, (u32 )size, +pr_devel ("ACCESS OK at 0x%08x (size 0x%x), seg 0x%08x\n" , + (__force u32 )addr, (u32 )size, (u32 )get_fs ().seg);return 1 ; }@@ -120,7 +119,7 @@ static inline unsigned long __must_check clear_user(void __user *to, unsigned long n) {might_fault (); -if (unlikely (!access_ok (VERIFY_WRITE , to, n))) +if (unlikely (!access_ok (to, n)))return n;return __clear_user (to, n);@@ -174,7 +173,7 @@ extern long __user_bad(void); const typeof(*(ptr)) __user *__gu_addr = (ptr); \int __gu_err =0 ; \ \ -if (access_ok (VERIFY_READ , __gu_addr, size)) { \ +if (access_ok (__gu_addr, size)) { \switch (size) { \case 1 : \ __get_user_asm("lbu", __gu_addr, __gu_val, \@@ -286,7 +285,7 @@ extern long __user_bad(void); typeof(*(ptr)) __user *__pu_addr = (ptr); \int __pu_err =0 ; \ \ -if (access_ok (VERIFY_WRITE , __pu_addr, size)) { \ +if (access_ok (__pu_addr, size)) { \switch (size) { \case 1 : \ __put_user_asm("sb", __pu_addr, __pu_val, \@@ -358,7 +357,7 @@ extern int __strncpy_user(char *to, const char __user *from, int len);static inline long strncpy_from_user (char *dst,const char __user *src,long count) { -if (!access_ok (VERIFY_READ , src,1 )) +if (!access_ok (src,1 ))return -EFAULT ;return __strncpy_user (dst, src, count); }@@ -372,7 +371,7 @@ extern int __strnlen_user(const char __user *sstr, int len);static inline long strnlen_user (const char __user *src,long n) { -if (!access_ok (VERIFY_READ , src,1 )) +if (!access_ok (src,1 ))return 0 ;return __strnlen_user (src, n); }arch/microblaze/kernel/signal.c +2
-2@@ -91,7 +91,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)/* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))@@ -166,7 +166,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;if (ksig->ka.sa.sa_flags &SA_SIGINFO )arch/mips/include/asm/checksum.h +2
-2@@ -63,7 +63,7 @@ static inline__wsum csum_and_copy_from_user (const void __user *src,void *dst,int len,__wsum sum,int *err_ptr) { -if (access_ok (VERIFY_READ , src, len)) +if (access_ok (src, len))return csum_partial_copy_from_user (src, dst, len, sum, err_ptr);if (len)@@ -81,7 +81,7 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) {might_fault (); -if (access_ok (VERIFY_WRITE , dst, len)) { +if (access_ok (dst, len)) { if (uaccess_kernel()) return __csum_partial_copy_kernel(src, (__force void *)dst,arch/mips/include/asm/futex.h +1
-1@@ -129,7 +129,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret =0 ;u32 val; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;if (cpu_has_llsc &&R10000_LLSC_WAR ) {arch/mips/include/asm/termios.h +2
-2@@ -32,7 +32,7 @@ static inline int user_termio_to_kernel_termios(struct ktermios *termios,unsigned short iflag, oflag, cflag, lflag;unsigned int err; -if (!access_ok (VERIFY_READ , termio,sizeof (struct termio ))) +if (!access_ok (termio,sizeof (struct termio )))return -EFAULT ; err =__get_user (iflag, &termio->c_iflag);@@ -61,7 +61,7 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio, {int err; -if (!access_ok (VERIFY_WRITE , termio,sizeof (struct termio ))) +if (!access_ok (termio,sizeof (struct termio )))return -EFAULT ; err =__put_user (termios->c_iflag, &termio->c_iflag);arch/mips/include/asm/uaccess.h +4
-8@@ -109,9 +109,6 @@ static inline bool eva_kernel_access(void)/* * access_ok: - Checks if a user space pointer is valid -* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE. Note that -* %VERIFY_WRITE is a superset of %VERIFY_READ - if it is safe -* to write to a block, it is always safe to read from it. * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -134,7 +131,7 @@ static inline int __access_ok(const void __user *p, unsigned long size)return (get_fs ().seg & (addr | (addr + size) |__ua_size (size))) ==0 ; } -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ likely(__access_ok((addr), (size)))/* @@ -304,7 +301,7 @@ do { \ const __typeof__(*(ptr)) __user * __gu_ptr = (ptr); \ \might_fault (); \ -if (likely (access_ok (VERIFY_READ , __gu_ptr, size))) { \ +if (likely (access_ok ( __gu_ptr, size))) { \if (eva_kernel_access ()) \__get_kernel_common ((x), size, __gu_ptr); \else \@@ -446,7 +443,7 @@ do { \int __pu_err = -EFAULT ; \ \might_fault (); \ -if (likely (access_ok (VERIFY_WRITE , __pu_addr, size))) { \ +if (likely (access_ok ( __pu_addr, size))) { \if (eva_kernel_access ()) \__put_kernel_common (__pu_addr, size); \else \@@ -691,8 +688,7 @@ __clear_user(void __user *addr, __kernel_size_t size) ({ \ void __user * __cl_addr = (addr); \unsigned long __cl_size = (n); \ -if (__cl_size &&access_ok (VERIFY_WRITE , \ - __cl_addr, __cl_size)) \ +if (__cl_size &&access_ok (__cl_addr, __cl_size)) \ __cl_size =__clear_user (__cl_addr, __cl_size); \ __cl_size; \ })arch/mips/kernel/mips-r2-to-r6-emul.c +12
-12@@ -1205,7 +1205,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31)case lwl_op: rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_READ , (void __user *)vaddr,4 )) { +if (!access_ok ((void __user *)vaddr,4 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1278,7 +1278,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31)case lwr_op: rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_READ , (void __user *)vaddr,4 )) { +if (!access_ok ((void __user *)vaddr,4 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1352,7 +1352,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31)case swl_op: rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_WRITE , (void __user *)vaddr,4 )) { +if (!access_ok ((void __user *)vaddr,4 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1422,7 +1422,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31)case swr_op: rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_WRITE , (void __user *)vaddr,4 )) { +if (!access_ok ((void __user *)vaddr,4 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1497,7 +1497,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_READ , (void __user *)vaddr,8 )) { +if (!access_ok ((void __user *)vaddr,8 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1616,7 +1616,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_READ , (void __user *)vaddr,8 )) { +if (!access_ok ((void __user *)vaddr,8 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1735,7 +1735,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_WRITE , (void __user *)vaddr,8 )) { +if (!access_ok ((void __user *)vaddr,8 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1853,7 +1853,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) rt = regs->regs[MIPSInst_RT (inst)]; vaddr = regs->regs[MIPSInst_RS (inst)] +MIPSInst_SIMM (inst); -if (!access_ok (VERIFY_WRITE , (void __user *)vaddr,8 )) { +if (!access_ok ((void __user *)vaddr,8 )) { current->thread.cp0_baduaddr = vaddr; err =SIGSEGV ;break ;@@ -1970,7 +1970,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) err =SIGBUS ;break ; } -if (!access_ok (VERIFY_READ , (void __user *)vaddr,4 )) { +if (!access_ok ((void __user *)vaddr,4 )) { current->thread.cp0_baduaddr = vaddr; err =SIGBUS ;break ;@@ -2026,7 +2026,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) err =SIGBUS ;break ; } -if (!access_ok (VERIFY_WRITE , (void __user *)vaddr,4 )) { +if (!access_ok ((void __user *)vaddr,4 )) { current->thread.cp0_baduaddr = vaddr; err =SIGBUS ;break ;@@ -2089,7 +2089,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) err =SIGBUS ;break ; } -if (!access_ok (VERIFY_READ , (void __user *)vaddr,8 )) { +if (!access_ok ((void __user *)vaddr,8 )) { current->thread.cp0_baduaddr = vaddr; err =SIGBUS ;break ;@@ -2150,7 +2150,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) err =SIGBUS ;break ; } -if (!access_ok (VERIFY_WRITE , (void __user *)vaddr,8 )) { +if (!access_ok ((void __user *)vaddr,8 )) { current->thread.cp0_baduaddr = vaddr; err =SIGBUS ;break ;arch/mips/kernel/ptrace.c +6
-6@@ -71,7 +71,7 @@ int ptrace_getregs(struct task_struct *child, struct user_pt_regs __user *data)struct pt_regs *regs;int i; -if (!access_ok (VERIFY_WRITE , data,38 *8 )) +if (!access_ok (data,38 *8 ))return -EIO ; regs =task_pt_regs (child);@@ -98,7 +98,7 @@ int ptrace_setregs(struct task_struct *child, struct user_pt_regs __user *data)struct pt_regs *regs;int i; -if (!access_ok (VERIFY_READ , data,38 *8 )) +if (!access_ok (data,38 *8 ))return -EIO ; regs =task_pt_regs (child);@@ -125,7 +125,7 @@ int ptrace_get_watch_regs(struct task_struct *child,if (!cpu_has_watch || boot_cpu_data.watch_reg_use_cnt ==0 )return -EIO ; -if (!access_ok (VERIFY_WRITE , addr,sizeof (struct pt_watch_regs ))) +if (!access_ok (addr,sizeof (struct pt_watch_regs )))return -EIO ;#ifdef CONFIG_32BIT @@ -167,7 +167,7 @@ int ptrace_set_watch_regs(struct task_struct *child,if (!cpu_has_watch || boot_cpu_data.watch_reg_use_cnt ==0 )return -EIO ; -if (!access_ok (VERIFY_READ , addr,sizeof (struct pt_watch_regs ))) +if (!access_ok (addr,sizeof (struct pt_watch_regs )))return -EIO ;/* Check the values. */ for (i =0 ; i < boot_cpu_data.watch_reg_use_cnt; i++) {@@ -359,7 +359,7 @@ int ptrace_getfpregs(struct task_struct *child, __u32 __user *data) {int i; -if (!access_ok (VERIFY_WRITE , data,33 *8 )) +if (!access_ok (data,33 *8 ))return -EIO ;if (tsk_used_math (child)) {@@ -385,7 +385,7 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)u32 value;int i; -if (!access_ok (VERIFY_READ , data,33 *8 )) +if (!access_ok (data,33 *8 ))return -EIO ;init_fp_ctx (child);arch/mips/kernel/signal.c +6
-6@@ -590,7 +590,7 @@ SYSCALL_DEFINE3(sigaction, int, sig, const struct sigaction __user *, act,if (act) {old_sigset_t mask; -if (!access_ok (VERIFY_READ , act,sizeof (*act))) +if (!access_ok (act,sizeof (*act)))return -EFAULT ; err |=__get_user (new_ka.sa.sa_handler, &act->sa_handler); err |=__get_user (new_ka.sa.sa_flags, &act->sa_flags);@@ -604,7 +604,7 @@ SYSCALL_DEFINE3(sigaction, int, sig, const struct sigaction __user *, act, ret =do_sigaction (sig, act ? &new_ka :NULL , oact ? &old_ka :NULL );if (!ret && oact) { -if (!access_ok (VERIFY_WRITE , oact,sizeof (*oact))) +if (!access_ok (oact,sizeof (*oact)))return -EFAULT ; err |=__put_user (old_ka.sa.sa_flags, &oact->sa_flags); err |=__put_user (old_ka.sa.sa_handler, &oact->sa_handler);@@ -630,7 +630,7 @@ asmlinkage void sys_sigreturn(void) regs =current_pt_regs (); frame = (struct sigframe __user *)regs->regs[29 ]; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&blocked, &frame->sf_mask,sizeof (blocked))) goto badframe;@@ -667,7 +667,7 @@ asmlinkage void sys_rt_sigreturn(void) regs =current_pt_regs (); frame = (struct rt_sigframe __user *)regs->regs[29 ]; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->rs_uc.uc_sigmask,sizeof (set))) goto badframe;@@ -705,7 +705,7 @@ static int setup_frame(void *sig_return, struct ksignal *ksig,int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=setup_sigcontext (regs, &frame->sf_sc);@@ -744,7 +744,7 @@ static int setup_rt_frame(void *sig_return, struct ksignal *ksig,int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;/* Create siginfo. */ arch/mips/kernel/signal32.c +2
-2@@ -46,7 +46,7 @@ SYSCALL_DEFINE3(32_sigaction, long, sig, const struct compat_sigaction __user *,old_sigset_t mask;s32 handler; -if (!access_ok (VERIFY_READ , act,sizeof (*act))) +if (!access_ok (act,sizeof (*act)))return -EFAULT ; err |=__get_user (handler, &act->sa_handler); new_ka.sa.sa_handler = (void __user *)(s64 )handler;@@ -61,7 +61,7 @@ SYSCALL_DEFINE3(32_sigaction, long, sig, const struct compat_sigaction __user *, ret =do_sigaction (sig, act ? &new_ka :NULL , oact ? &old_ka :NULL );if (!ret && oact) { -if (!access_ok (VERIFY_WRITE , oact,sizeof (*oact))) +if (!access_ok (oact,sizeof (*oact)))return -EFAULT ; err |=__put_user (old_ka.sa.sa_flags, &oact->sa_flags); err |= __put_user((u32)(u64)old_ka.sa.sa_handler,arch/mips/kernel/signal_n32.c +2
-2@@ -73,7 +73,7 @@ asmlinkage void sysn32_rt_sigreturn(void) regs =current_pt_regs (); frame = (struct rt_sigframe_n32 __user *)regs->regs[29 ]; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_conv_sigset_from_user (&set, &frame->rs_uc.uc_sigmask)) goto badframe;@@ -110,7 +110,7 @@ static int setup_rt_frame_n32(void *sig_return, struct ksignal *ksig,int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;/* Create siginfo. */ arch/mips/kernel/signal_o32.c +4
-4@@ -118,7 +118,7 @@ static int setup_frame_32(void *sig_return, struct ksignal *ksig,int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=setup_sigcontext32 (regs, &frame->sf_sc);@@ -160,7 +160,7 @@ asmlinkage void sys32_rt_sigreturn(void) regs =current_pt_regs (); frame = (struct rt_sigframe32 __user *)regs->regs[29 ]; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_conv_sigset_from_user (&set, &frame->rs_uc.uc_sigmask)) goto badframe;@@ -197,7 +197,7 @@ static int setup_rt_frame_32(void *sig_return, struct ksignal *ksig,int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;/* Convert (siginfo_t -> compat_siginfo_t) and copy to user. */ @@ -262,7 +262,7 @@ asmlinkage void sys32_sigreturn(void) regs =current_pt_regs (); frame = (struct sigframe32 __user *)regs->regs[29 ]; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_conv_sigset_from_user (&blocked, &frame->sf_mask)) goto badframe;arch/mips/kernel/syscall.c +1
-1@@ -101,7 +101,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new)if (unlikely (addr &3 ))return -EINVAL ; -if (unlikely (!access_ok (VERIFY_WRITE , (const void __user *)addr,4 ))) +if (unlikely (!access_ok ((const void __user *)addr,4 )))return -EINVAL ;if (cpu_has_llsc &&R10000_LLSC_WAR ) {arch/mips/kernel/unaligned.c +47
-51@@ -936,7 +936,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,if (insn.dsp_format.func == lx_op) {switch (insn.dsp_format.op) {case lwx_op: -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;LoadW (addr, value, res);if (res)@@ -945,7 +945,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, regs->regs[insn.dsp_format.rd] = value;break ;case lhx_op: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;LoadHW (addr, value, res);if (res)@@ -968,7 +968,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,set_fs (USER_DS );switch (insn.spec3_format.func) {case lhe_op: -if (!access_ok (VERIFY_READ , addr,2 )) { +if (!access_ok (addr,2 )) {set_fs (seg); goto sigbus; }@@ -981,7 +981,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, regs->regs[insn.spec3_format.rt] = value;break ;case lwe_op: -if (!access_ok (VERIFY_READ , addr,4 )) { +if (!access_ok (addr,4 )) {set_fs (seg); goto sigbus; }@@ -994,7 +994,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, regs->regs[insn.spec3_format.rt] = value;break ;case lhue_op: -if (!access_ok (VERIFY_READ , addr,2 )) { +if (!access_ok (addr,2 )) {set_fs (seg); goto sigbus; }@@ -1007,7 +1007,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, regs->regs[insn.spec3_format.rt] = value;break ;case she_op: -if (!access_ok (VERIFY_WRITE , addr,2 )) { +if (!access_ok (addr,2 )) {set_fs (seg); goto sigbus; }@@ -1020,7 +1020,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, }break ;case swe_op: -if (!access_ok (VERIFY_WRITE , addr,4 )) { +if (!access_ok (addr,4 )) {set_fs (seg); goto sigbus; }@@ -1041,7 +1041,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,#endif break ;case lh_op: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;if (IS_ENABLED (CONFIG_EVA )) {@@ -1060,7 +1060,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,break ;case lw_op: -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;if (IS_ENABLED (CONFIG_EVA )) {@@ -1079,7 +1079,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,break ;case lhu_op: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;if (IS_ENABLED (CONFIG_EVA )) {@@ -1106,7 +1106,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;LoadWU (addr, value, res);@@ -1129,7 +1129,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_READ , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus;LoadDW (addr, value, res);@@ -1144,7 +1144,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, goto sigill;case sh_op: -if (!access_ok (VERIFY_WRITE , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;compute_return_epc (regs);@@ -1164,7 +1164,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,break ;case sw_op: -if (!access_ok (VERIFY_WRITE , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;compute_return_epc (regs);@@ -1192,7 +1192,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_WRITE , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus;compute_return_epc (regs);@@ -1254,7 +1254,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,switch (insn.msa_mi10_format.func) {case msa_ld_op: -if (!access_ok (VERIFY_READ , addr,sizeof (*fpr))) +if (!access_ok (addr,sizeof (*fpr))) goto sigbus; do {@@ -1290,7 +1290,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,break ;case msa_st_op: -if (!access_ok (VERIFY_WRITE , addr,sizeof (*fpr))) +if (!access_ok (addr,sizeof (*fpr))) goto sigbus;/* @@ -1463,7 +1463,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if (reg ==31 ) goto sigbus; -if (!access_ok (VERIFY_READ , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus;LoadW (addr, value, res);@@ -1482,7 +1482,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if (reg ==31 ) goto sigbus; -if (!access_ok (VERIFY_WRITE , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus; value = regs->regs[reg];@@ -1502,7 +1502,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if (reg ==31 ) goto sigbus; -if (!access_ok (VERIFY_READ , addr,16 )) +if (!access_ok (addr,16 )) goto sigbus;LoadDW (addr, value, res);@@ -1525,7 +1525,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if (reg ==31 ) goto sigbus; -if (!access_ok (VERIFY_WRITE , addr,16 )) +if (!access_ok (addr,16 )) goto sigbus; value = regs->regs[reg];@@ -1548,11 +1548,10 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if ((rvar >9 ) || !reg) goto sigill;if (reg &0x10 ) { -if (!access_ok - (VERIFY_READ , addr,4 * (rvar +1 ))) +if (!access_ok (addr,4 * (rvar +1 ))) goto sigbus; }else { -if (!access_ok (VERIFY_READ , addr,4 * rvar)) +if (!access_ok (addr,4 * rvar)) goto sigbus; }if (rvar ==9 )@@ -1585,11 +1584,10 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if ((rvar >9 ) || !reg) goto sigill;if (reg &0x10 ) { -if (!access_ok - (VERIFY_WRITE , addr,4 * (rvar +1 ))) +if (!access_ok (addr,4 * (rvar +1 ))) goto sigbus; }else { -if (!access_ok (VERIFY_WRITE , addr,4 * rvar)) +if (!access_ok (addr,4 * rvar)) goto sigbus; }if (rvar ==9 )@@ -1623,11 +1621,10 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if ((rvar >9 ) || !reg) goto sigill;if (reg &0x10 ) { -if (!access_ok - (VERIFY_READ , addr,8 * (rvar +1 ))) +if (!access_ok (addr,8 * (rvar +1 ))) goto sigbus; }else { -if (!access_ok (VERIFY_READ , addr,8 * rvar)) +if (!access_ok (addr,8 * rvar)) goto sigbus; }if (rvar ==9 )@@ -1665,11 +1662,10 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,if ((rvar >9 ) || !reg) goto sigill;if (reg &0x10 ) { -if (!access_ok - (VERIFY_WRITE , addr,8 * (rvar +1 ))) +if (!access_ok (addr,8 * (rvar +1 ))) goto sigbus; }else { -if (!access_ok (VERIFY_WRITE , addr,8 * rvar)) +if (!access_ok (addr,8 * rvar)) goto sigbus; }if (rvar ==9 )@@ -1788,7 +1784,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,case mm_lwm16_op: reg = insn.mm16_m_format.rlist; rvar = reg +1 ; -if (!access_ok (VERIFY_READ , addr,4 * rvar)) +if (!access_ok (addr,4 * rvar)) goto sigbus;for (i =16 ; rvar; rvar--, i++) {@@ -1808,7 +1804,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,case mm_swm16_op: reg = insn.mm16_m_format.rlist; rvar = reg +1 ; -if (!access_ok (VERIFY_WRITE , addr,4 * rvar)) +if (!access_ok (addr,4 * rvar)) goto sigbus;for (i =16 ; rvar; rvar--, i++) {@@ -1862,7 +1858,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs, } loadHW: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;LoadHW (addr, value, res);@@ -1872,7 +1868,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs, goto success; loadHWU: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;LoadHWU (addr, value, res);@@ -1882,7 +1878,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs, goto success; loadW: -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;LoadW (addr, value, res);@@ -1900,7 +1896,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;LoadWU (addr, value, res);@@ -1922,7 +1918,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_READ , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus;LoadDW (addr, value, res);@@ -1936,7 +1932,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs, goto sigill; storeHW: -if (!access_ok (VERIFY_WRITE , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus; value = regs->regs[reg];@@ -1946,7 +1942,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs, goto success; storeW: -if (!access_ok (VERIFY_WRITE , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus; value = regs->regs[reg];@@ -1964,7 +1960,7 @@ static void emulate_load_store_microMIPS(struct pt_regs *regs,* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_WRITE , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus; value = regs->regs[reg];@@ -2122,7 +2118,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr) goto sigbus;case MIPS16e_lh_op: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;LoadHW (addr, value, res);@@ -2133,7 +2129,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr)break ;case MIPS16e_lhu_op: -if (!access_ok (VERIFY_READ , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;LoadHWU (addr, value, res);@@ -2146,7 +2142,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr)case MIPS16e_lw_op:case MIPS16e_lwpc_op:case MIPS16e_lwsp_op: -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;LoadW (addr, value, res);@@ -2165,7 +2161,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr)* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_READ , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;LoadWU (addr, value, res);@@ -2189,7 +2185,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr)* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_READ , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus;LoadDW (addr, value, res);@@ -2204,7 +2200,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr) goto sigill;case MIPS16e_sh_op: -if (!access_ok (VERIFY_WRITE , addr,2 )) +if (!access_ok (addr,2 )) goto sigbus;MIPS16e_compute_return_epc (regs, &oldinst);@@ -2217,7 +2213,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr)case MIPS16e_sw_op:case MIPS16e_swsp_op:case MIPS16e_i8_op:/* actually - MIPS16e_swrasp_func */ -if (!access_ok (VERIFY_WRITE , addr,4 )) +if (!access_ok (addr,4 )) goto sigbus;MIPS16e_compute_return_epc (regs, &oldinst);@@ -2237,7 +2233,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr)* would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ -if (!access_ok (VERIFY_WRITE , addr,8 )) +if (!access_ok (addr,8 )) goto sigbus;MIPS16e_compute_return_epc (regs, &oldinst);arch/mips/math-emu/cp1emu.c +8
-8@@ -1063,7 +1063,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, MIPSInst_SIMM(ir));MIPS_FPU_EMU_INC_STATS (loads); -if (!access_ok (VERIFY_READ , dva,sizeof (u64))) { +if (!access_ok (dva,sizeof (u64))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = dva;return SIGBUS ;@@ -1081,7 +1081,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, MIPSInst_SIMM(ir));MIPS_FPU_EMU_INC_STATS (stores);DIFROMREG (dval,MIPSInst_RT (ir)); -if (!access_ok (VERIFY_WRITE , dva,sizeof (u64))) { +if (!access_ok (dva,sizeof (u64))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = dva;return SIGBUS ;@@ -1097,7 +1097,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, wva = (u32 __user *) (xcp->regs[MIPSInst_RS (ir)] +MIPSInst_SIMM (ir));MIPS_FPU_EMU_INC_STATS (loads); -if (!access_ok (VERIFY_READ , wva,sizeof (u32))) { +if (!access_ok (wva,sizeof (u32))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = wva;return SIGBUS ;@@ -1115,7 +1115,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, MIPSInst_SIMM(ir));MIPS_FPU_EMU_INC_STATS (stores);SIFROMREG (wval,MIPSInst_RT (ir)); -if (!access_ok (VERIFY_WRITE , wva,sizeof (u32))) { +if (!access_ok (wva,sizeof (u32))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = wva;return SIGBUS ;@@ -1493,7 +1493,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, xcp->regs[MIPSInst_FT(ir)]);MIPS_FPU_EMU_INC_STATS (loads); -if (!access_ok (VERIFY_READ , va,sizeof (u32))) { +if (!access_ok (va,sizeof (u32))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = va;return SIGBUS ;@@ -1513,7 +1513,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,MIPS_FPU_EMU_INC_STATS (stores);SIFROMREG (val,MIPSInst_FS (ir)); -if (!access_ok (VERIFY_WRITE , va,sizeof (u32))) { +if (!access_ok (va,sizeof (u32))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = va;return SIGBUS ;@@ -1590,7 +1590,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, xcp->regs[MIPSInst_FT(ir)]);MIPS_FPU_EMU_INC_STATS (loads); -if (!access_ok (VERIFY_READ , va,sizeof (u64))) { +if (!access_ok (va,sizeof (u64))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = va;return SIGBUS ;@@ -1609,7 +1609,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,MIPS_FPU_EMU_INC_STATS (stores);DIFROMREG (val,MIPSInst_FS (ir)); -if (!access_ok (VERIFY_WRITE , va,sizeof (u64))) { +if (!access_ok (va,sizeof (u64))) {MIPS_FPU_EMU_INC_STATS (errors); *fault_addr = va;return SIGBUS ;arch/mips/mm/cache.c +1
-1@@ -76,7 +76,7 @@ SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, bytes, {if (bytes ==0 )return 0 ; -if (!access_ok (VERIFY_WRITE , (void __user *) addr, bytes)) +if (!access_ok ((void __user *) addr, bytes))return -EFAULT ;__flush_icache_user_range (addr, addr + bytes);arch/mips/mm/gup.c +1
-2@@ -195,8 +195,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, addr = start; len = (unsigned long ) nr_pages <<PAGE_SHIFT ; end = start + len; -if (unlikely (!access_ok (write ?VERIFY_WRITE :VERIFY_READ , - (void __user *)start, len))) +if (unlikely (!access_ok ((void __user *)start, len)))return 0 ;/* arch/mips/oprofile/backtrace.c +1
-1@@ -19,7 +19,7 @@ struct stackframe {static inline int get_mem (unsigned long addr,unsigned long *result) {unsigned long *address = (unsigned long *) addr; -if (!access_ok (VERIFY_READ , address,sizeof (unsigned long ))) +if (!access_ok (address,sizeof (unsigned long )))return -1 ;if (__copy_from_user_inatomic (result, address,sizeof (unsigned long )))return -3 ;arch/mips/sibyte/common/sb_tbprof.c +1
-1@@ -458,7 +458,7 @@ static ssize_t sbprof_tb_read(struct file *filp, char *buf,char *dest = buf;long cur_off = *offp; -if (!access_ok (VERIFY_WRITE , buf, size)) +if (!access_ok (buf, size))return -EFAULT ;mutex_lock (&sbp.lock);arch/nds32/include/asm/futex.h +1
-1@@ -40,7 +40,7 @@ futex_atomic_cmpxchg_inatomic(u32 * uval, u32 __user * uaddr,int ret =0 ;u32 val, tmp, flags; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;smp_mb ();arch/nds32/include/asm/uaccess.h +4
-7@@ -13,9 +13,6 @@#include <asm/types.h> #include <linux/mm.h> -#define VERIFY_READ 0 -#define VERIFY_WRITE 1 -#define __asmeq (x, y) ".ifnc " x "," y " ; .err ; .endif\n\t"/* @@ -53,7 +50,7 @@ static inline void set_fs(mm_segment_t fs)#define __range_ok (addr, size) (size <= get_fs() && addr <= (get_fs() -size)) -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ __range_ok((unsigned long)addr, (unsigned long)size)/* * Single-value transfer routines. They automatically use the right @@ -94,7 +91,7 @@ static inline void set_fs(mm_segment_t fs) ({ \ const __typeof__(*(ptr)) __user *__p = (ptr); \ might_fault(); \ - if (access_ok(VERIFY_READ, __p, sizeof(*__p))) { \ + if (access_ok(__p, sizeof(*__p))) { \ __get_user_err((x), __p, (err)); \ } else { \ (x) = 0; (err) = -EFAULT; \@@ -189,7 +186,7 @@ do { \ ({ \ __typeof__(*(ptr)) __user *__p = (ptr); \ might_fault(); \ - if (access_ok(VERIFY_WRITE, __p, sizeof(*__p))) { \ + if (access_ok(__p, sizeof(*__p))) { \ __put_user_err((x), __p, (err)); \ } else { \ (err) = -EFAULT; \@@ -279,7 +276,7 @@ extern unsigned long __arch_copy_to_user(void __user * to, const void *from,#define INLINE_COPY_TO_USER static inline unsigned long clear_user (void __user * to,unsigned long n) { -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n)) n =__arch_clear_user (to, n);return n; }arch/nds32/kernel/perf_event_cpu.c +5
-6@@ -1306,7 +1306,7 @@ user_backtrace(struct perf_callchain_entry_ctx *entry, unsigned long fp) (unsigned long *)(fp - (unsigned long )sizeof (buftail));/* Check accessibility of one struct frame_tail beyond */ -if (!access_ok (VERIFY_READ , user_frame_tail,sizeof (buftail))) +if (!access_ok (user_frame_tail,sizeof (buftail)))return 0 ;if (__copy_from_user_inatomic (&buftail, user_frame_tail,sizeof (buftail)))@@ -1332,7 +1332,7 @@ user_backtrace_opt_size(struct perf_callchain_entry_ctx *entry, (unsigned long *)(fp - (unsigned long )sizeof (buftail));/* Check accessibility of one struct frame_tail beyond */ -if (!access_ok (VERIFY_READ , user_frame_tail,sizeof (buftail))) +if (!access_ok (user_frame_tail,sizeof (buftail)))return 0 ;if (__copy_from_user_inatomic (&buftail, user_frame_tail,sizeof (buftail)))@@ -1386,7 +1386,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, user_frame_tail = (unsigned long *)(fp - (unsigned long )sizeof (fp)); -if (!access_ok (VERIFY_READ , user_frame_tail,sizeof (fp))) +if (!access_ok (user_frame_tail,sizeof (fp)))return ; if (__copy_from_user_inatomic@@ -1406,8 +1406,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, (unsigned long *)(fp - (unsigned long )sizeof (buftail)); -if (!access_ok - (VERIFY_READ , user_frame_tail,sizeof (buftail))) +if (!access_ok (user_frame_tail,sizeof (buftail)))return ; if (__copy_from_user_inatomic@@ -1424,7 +1423,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, (unsigned long *)(fp - (unsigned long )sizeof (buftail_opt_size)); -if (!access_ok (VERIFY_READ , user_frame_tail, +if (!access_ok (user_frame_tail,sizeof (buftail_opt_size)))return ;arch/nds32/kernel/signal.c +2
-2@@ -151,7 +151,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) frame = (struct rt_sigframe __user *)regs->sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (restore_sigframe (regs, frame))@@ -275,7 +275,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t * set, struct pt_regs *regs)get_sigframe (ksig, regs,sizeof (*frame));int err =0 ; -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;__put_user_error (0 , &frame->uc.uc_flags, err);arch/nds32/mm/alignment.c +4
-4@@ -289,13 +289,13 @@ static inline int do_16(unsigned long inst, struct pt_regs *regs) unaligned_addr += shift;if (load) { -if (!access_ok (VERIFY_READ , (void *)unaligned_addr, len)) +if (!access_ok ((void *)unaligned_addr, len))return -EACCES ;get_data (unaligned_addr, &target_val, len); *idx_to_addr (regs, target_idx) = target_val; }else { -if (!access_ok (VERIFY_WRITE , (void *)unaligned_addr, len)) +if (!access_ok ((void *)unaligned_addr, len))return -EACCES ; target_val = *idx_to_addr (regs, target_idx);set_data ((void *)unaligned_addr, target_val, len);@@ -479,7 +479,7 @@ static inline int do_32(unsigned long inst, struct pt_regs *regs)if (load) { -if (!access_ok (VERIFY_READ , (void *)unaligned_addr, len)) +if (!access_ok ((void *)unaligned_addr, len))return -EACCES ;get_data (unaligned_addr, &target_val, len);@@ -491,7 +491,7 @@ static inline int do_32(unsigned long inst, struct pt_regs *regs) *idx_to_addr (regs,RT (inst)) = target_val; }else { -if (!access_ok (VERIFY_WRITE , (void *)unaligned_addr, len)) +if (!access_ok ((void *)unaligned_addr, len))return -EACCES ; target_val = *idx_to_addr (regs,RT (inst));arch/nios2/include/asm/uaccess.h +4
-4@@ -37,7 +37,7 @@ (((signed long )(((long )get_fs ().seg) & \ ((long)(addr) | (((long)(addr)) + (len)) | (len)))) == 0) -#define access_ok (type, addr, len) \ +#define access_ok (addr, len) \ likely(__access_ok((unsigned long)(addr), (unsigned long)(len)))# define __EX_TABLE_SECTION ".section __ex_table,\"a\"\n"@@ -70,7 +70,7 @@ static inline unsigned long __must_check __clear_user(void __user *to,static inline unsigned long __must_check clear_user (void __user *to,unsigned long n) { -if (!access_ok (VERIFY_WRITE , to, n)) +if (!access_ok (to, n))return n;return __clear_user (to, n); }@@ -142,7 +142,7 @@ do { \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \unsigned long __gu_val =0 ; \ -if (access_ok (VERIFY_READ , __gu_ptr,sizeof (*__gu_ptr))) \ +if (access_ok ( __gu_ptr,sizeof (*__gu_ptr))) \__get_user_common (__gu_val,sizeof (*__gu_ptr), \ __gu_ptr, __gu_err); \ (x) = (__force __typeof__(x))__gu_val; \@@ -168,7 +168,7 @@ do { \long __pu_err = -EFAULT ; \ __typeof__(*(ptr)) __user *__pu_ptr = (ptr); \ __typeof__(*(ptr)) __pu_val = (__typeof(*ptr))(x); \ -if (access_ok (VERIFY_WRITE , __pu_ptr,sizeof (*__pu_ptr))) { \ +if (access_ok (__pu_ptr,sizeof (*__pu_ptr))) { \switch (sizeof (*__pu_ptr)) { \case 1 : \__put_user_asm (__pu_val,"stb" , __pu_ptr, __pu_err); \arch/nios2/kernel/signal.c +1
-1@@ -106,7 +106,7 @@ asmlinkage int do_rt_sigreturn(struct switch_stack *sw)sigset_t set;int rval; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))arch/openrisc/include/asm/futex.h +1
-1@@ -72,7 +72,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret =0 ;u32 prev; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ; __asm__ __volatile__ ( \arch/openrisc/include/asm/uaccess.h +4
-4@@ -58,7 +58,7 @@/* Ensure that addr is below task's addr_limit */ #define __addr_ok (addr) ((unsigned long) addr < get_fs()) -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ __range_ok((unsigned long)addr, (unsigned long)size)/* @@ -102,7 +102,7 @@ extern long __put_user_bad(void); ({ \long __pu_err = -EFAULT ; \__typeof__ (*(ptr)) *__pu_addr = (ptr); \ -if (access_ok (VERIFY_WRITE , __pu_addr, size)) \ +if (access_ok (__pu_addr, size)) \__put_user_size ((x), __pu_addr, (size), __pu_err); \ __pu_err; \ })@@ -175,7 +175,7 @@ struct __large_struct { ({ \ long __gu_err = -EFAULT, __gu_val = 0; \ const __typeof__(*(ptr)) * __gu_addr = (ptr); \ - if (access_ok(VERIFY_READ, __gu_addr, size)) \ + if (access_ok(__gu_addr, size)) \ __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ __gu_err; \@@ -254,7 +254,7 @@ extern unsigned long __clear_user(void *addr, unsigned long size);static inline __must_check unsigned long clear_user (void *addr,unsigned long size) { -if (likely (access_ok (VERIFY_WRITE , addr, size))) +if (likely (access_ok (addr, size))) size =__clear_user (addr, size);return size; }arch/openrisc/kernel/signal.c +3
-3@@ -50,7 +50,7 @@ static int restore_sigcontext(struct pt_regs *regs,/* * Restore the regs from &sc->regs. -* (sc is already checked for VERIFY_READ since the sigframe was +* (sc is already checked since the sigframe was * checked in sys_sigreturn previously) */ err |=__copy_from_user (regs, sc->regs.gpr,32 *sizeof (unsigned long ));@@ -83,7 +83,7 @@ asmlinkage long _sys_rt_sigreturn(struct pt_regs *regs)if (((long )frame) &3 ) goto badframe; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;@@ -161,7 +161,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;/* Create siginfo. */ arch/parisc/include/asm/futex.h +1
-1@@ -95,7 +95,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,if (uaccess_kernel () && !uaddr)return -EFAULT ; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;/* HPPA has no cmpxchg in hardware and therefore the arch/parisc/include/asm/uaccess.h +1
-1@@ -27,7 +27,7 @@* that put_user is the same as __put_user, etc. */ -#define access_ok (type, uaddr, size) \ +#define access_ok (uaddr, size) \ ( (uaddr) == (uaddr) )#define put_user __put_userarch/powerpc/include/asm/futex.h +1
-1@@ -72,7 +72,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,int ret =0 ;u32 prev; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ; __asm__ __volatile__ (arch/powerpc/include/asm/uaccess.h +4
-4@@ -62,7 +62,7 @@ static inline int __access_ok(unsigned long addr, unsigned long size,#endif -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ (__chk_user_ptr(addr), (void)(type), \ __access_ok((__force unsigned long)(addr), (size), get_fs()))@@ -166,7 +166,7 @@ do { \long __pu_err = -EFAULT ; \ __typeof__(*(ptr)) __user *__pu_addr = (ptr); \might_fault (); \ -if (access_ok (VERIFY_WRITE , __pu_addr, size)) \ +if (access_ok (__pu_addr, size)) \__put_user_size ((x), __pu_addr, (size), __pu_err); \ __pu_err; \ })@@ -276,7 +276,7 @@ do { \ __long_type(*(ptr)) __gu_val = 0; \ __typeof__(*(ptr)) __user *__gu_addr = (ptr); \might_fault (); \ -if (access_ok (VERIFY_READ , __gu_addr, (size))) { \ +if (access_ok (__gu_addr, (size))) { \barrier_nospec (); \__get_user_size (__gu_val, __gu_addr, (size), __gu_err); \ } \@@ -374,7 +374,7 @@ extern unsigned long __clear_user(void __user *addr, unsigned long size);static inline unsigned long clear_user (void __user *addr,unsigned long size) {might_fault (); -if (likely (access_ok (VERIFY_WRITE , addr, size))) +if (likely (access_ok (addr, size)))return __clear_user (addr, size);return size; }arch/powerpc/kernel/align.c +1
-2@@ -131,8 +131,7 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg,/* Verify the address of the operand */ if (unlikely (user_mode (regs) && - !access_ok ((flags &ST ?VERIFY_WRITE :VERIFY_READ ), - addr, nb))) + !access_ok (addr, nb)))return -EFAULT ;/* userland only */ arch/powerpc/kernel/rtas_flash.c +1
-1@@ -523,7 +523,7 @@ static ssize_t validate_flash_write(struct file *file, const char __user *buf, args_buf->status =VALIDATE_INCOMPLETE ; } -if (!access_ok (VERIFY_READ , buf, count)) { +if (!access_ok (buf, count)) { rc = -EFAULT ; goto done; }arch/powerpc/kernel/rtasd.c +1
-1@@ -335,7 +335,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf, count = rtas_error_log_buffer_max; -if (!access_ok (VERIFY_WRITE , buf, count)) +if (!access_ok (buf, count))return -EFAULT ; tmp =kmalloc (count,GFP_KERNEL );arch/powerpc/kernel/signal.c +1
-1@@ -44,7 +44,7 @@ void __user *get_sigframe(struct ksignal *ksig, unsigned long sp, newsp = (oldsp - frame_size) & ~0xFUL ;/* Check access */ -if (!access_ok (VERIFY_WRITE , (void __user *)newsp, oldsp - newsp)) +if (!access_ok ((void __user *)newsp, oldsp - newsp))return NULL ;return (void __user *)newsp;arch/powerpc/kernel/signal_32.c +6
-6@@ -1017,7 +1017,7 @@ static int do_setcontext(struct ucontext __user *ucp, struct pt_regs *regs, int#else if (__get_user (mcp, &ucp->uc_regs))return -EFAULT ; -if (!access_ok (VERIFY_READ , mcp,sizeof (*mcp))) +if (!access_ok (mcp,sizeof (*mcp)))return -EFAULT ;#endif set_current_blocked (&set);@@ -1120,7 +1120,7 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,*/ mctx = (struct mcontext __user *) ((unsigned long ) &old_ctx->uc_mcontext & ~0xfUL ); -if (!access_ok (VERIFY_WRITE , old_ctx, ctx_size) +if (!access_ok (old_ctx, ctx_size) ||save_user_regs (regs, mctx,NULL ,0 , ctx_has_vsx_region) ||put_sigset_t (&old_ctx->uc_sigmask, ¤t->blocked) ||__put_user (to_user_ptr (mctx), &old_ctx->uc_regs))@@ -1128,7 +1128,7 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx, }if (new_ctx ==NULL )return 0 ; -if (!access_ok (VERIFY_READ , new_ctx, ctx_size) || +if (!access_ok (new_ctx, ctx_size) ||fault_in_pages_readable ((u8 __user *)new_ctx, ctx_size))return -EFAULT ;@@ -1169,7 +1169,7 @@ SYSCALL_DEFINE0(rt_sigreturn) rt_sf = (struct rt_sigframe __user *) (regs->gpr[1 ] + __SIGNAL_FRAMESIZE +16 ); -if (!access_ok (VERIFY_READ , rt_sf,sizeof (*rt_sf))) +if (!access_ok (rt_sf,sizeof (*rt_sf))) goto bad;#ifdef CONFIG_PPC_TRANSACTIONAL_MEM @@ -1315,7 +1315,7 @@ SYSCALL_DEFINE3(debug_setcontext, struct ucontext __user *, ctx, current->thread.debug.dbcr0 = new_dbcr0;#endif -if (!access_ok (VERIFY_READ , ctx,sizeof (*ctx)) || +if (!access_ok (ctx,sizeof (*ctx)) ||fault_in_pages_readable ((u8 __user *)ctx,sizeof (*ctx)))return -EFAULT ;@@ -1500,7 +1500,7 @@ SYSCALL_DEFINE0(sigreturn) { sr = (struct mcontext __user *)from_user_ptr (sigctx.regs); addr = sr; -if (!access_ok (VERIFY_READ , sr,sizeof (*sr)) +if (!access_ok (sr,sizeof (*sr)) ||restore_user_regs (regs, sr,1 )) goto badframe; }arch/powerpc/kernel/signal_64.c +6
-7@@ -383,7 +383,7 @@ static long restore_sigcontext(struct task_struct *tsk, sigset_t *set, int sig, err |=__get_user (v_regs, &sc->v_regs);if (err)return err; -if (v_regs && !access_ok (VERIFY_READ , v_regs,34 *sizeof (vector128))) +if (v_regs && !access_ok (v_regs,34 *sizeof (vector128)))return -EFAULT ;/* Copy 33 vec registers (vr0..31 and vscr) from the stack */ if (v_regs !=NULL && (msr &MSR_VEC ) !=0 ) {@@ -502,10 +502,9 @@ static long restore_tm_sigcontexts(struct task_struct *tsk, err |=__get_user (tm_v_regs, &tm_sc->v_regs);if (err)return err; -if (v_regs && !access_ok (VERIFY_READ , v_regs,34 *sizeof (vector128))) +if (v_regs && !access_ok (v_regs,34 *sizeof (vector128)))return -EFAULT ; -if (tm_v_regs && !access_ok (VERIFY_READ , - tm_v_regs,34 *sizeof (vector128))) +if (tm_v_regs && !access_ok (tm_v_regs,34 *sizeof (vector128)))return -EFAULT ;/* Copy 33 vec registers (vr0..31 and vscr) from the stack */ if (v_regs !=NULL && tm_v_regs !=NULL && (msr &MSR_VEC ) !=0 ) {@@ -671,7 +670,7 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx, ctx_has_vsx_region =1 ; if (old_ctx != NULL) { - if (!access_ok(VERIFY_WRITE, old_ctx, ctx_size) + if (!access_ok(old_ctx, ctx_size) || setup_sigcontext(&old_ctx->uc_mcontext, current, 0, NULL, 0, ctx_has_vsx_region) || __copy_to_user(&old_ctx->uc_sigmask,@@ -680,7 +679,7 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx, }if (new_ctx ==NULL )return 0 ; -if (!access_ok (VERIFY_READ , new_ctx, ctx_size) +if (!access_ok (new_ctx, ctx_size) ||__get_user (tmp, (u8 __user *) new_ctx) ||__get_user (tmp, (u8 __user *) new_ctx + ctx_size -1 ))return -EFAULT ;@@ -725,7 +724,7 @@ SYSCALL_DEFINE0(rt_sigreturn)/* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; -if (!access_ok (VERIFY_READ , uc,sizeof (*uc))) +if (!access_ok (uc,sizeof (*uc))) goto badframe;if (__copy_from_user (&set, &uc->uc_sigmask,sizeof (set)))arch/powerpc/kernel/syscalls.c +1
-1@@ -89,7 +89,7 @@ ppc_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, sif ( (unsigned long )n >=4096 ) {unsigned long __user *buffer = (unsigned long __user *)n; -if (!access_ok (VERIFY_READ , buffer,5 *sizeof (unsigned long )) +if (!access_ok (buffer,5 *sizeof (unsigned long )) ||__get_user (n, buffer) ||__get_user (inp, ((fd_set __user *__user *)(buffer+1 ))) || __get_user(outp, ((fd_set __user * __user *)(buffer+2)))arch/powerpc/kernel/traps.c +1
-1@@ -837,7 +837,7 @@ static void p9_hmi_special_emu(struct pt_regs *regs) addr = (__force const void __user *)ea;/* Check it */ -if (!access_ok (VERIFY_READ , addr,16 )) { +if (!access_ok (addr,16 )) { pr_devel("HMI vec emu: bad access %i:%s[%d] nip=%016lx" " instr=%08x addr=%016lx\n", smp_processor_id(), current->comm, current->pid,arch/powerpc/kvm/book3s_64_mmu_hv.c +2
-2@@ -1744,7 +1744,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,int first_pass;unsigned long hpte[2 ]; -if (!access_ok (VERIFY_WRITE , buf, count)) +if (!access_ok (buf, count))return -EFAULT ;if (kvm_is_radix (kvm))return 0 ;@@ -1844,7 +1844,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,int mmu_ready;int pshift; -if (!access_ok (VERIFY_READ , buf, count)) +if (!access_ok (buf, count))return -EFAULT ;if (kvm_is_radix (kvm))return -EINVAL ;arch/powerpc/lib/checksum_wrappers.c +2
-2@@ -37,7 +37,7 @@ __wsum csum_and_copy_from_user(const void __user *src, void *dst, goto out; } -if (unlikely ((len <0 ) || !access_ok (VERIFY_READ , src, len))) { +if (unlikely ((len <0 ) || !access_ok (src, len))) { *err_ptr = -EFAULT ; csum = (__force unsigned int )sum; goto out;@@ -78,7 +78,7 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, goto out; } -if (unlikely ((len <0 ) || !access_ok (VERIFY_WRITE , dst, len))) { +if (unlikely ((len <0 ) || !access_ok (dst, len))) { *err_ptr = -EFAULT ; csum =-1 ;/* invalid checksum */ goto out;arch/powerpc/mm/fault.c +1
-1@@ -274,7 +274,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address,return false;if ((flags &FAULT_FLAG_WRITE ) && (flags &FAULT_FLAG_USER ) && -access_ok (VERIFY_READ , nip,sizeof (*nip))) { +access_ok (nip,sizeof (*nip))) {unsigned int inst;int res;arch/powerpc/mm/subpage-prot.c +1
-1@@ -214,7 +214,7 @@ SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,return 0 ; } -if (!access_ok (VERIFY_READ , map, (len >>PAGE_SHIFT ) *sizeof (u32))) +if (!access_ok (map, (len >>PAGE_SHIFT ) *sizeof (u32)))return -EFAULT ;down_write (&mm->mmap_sem);arch/powerpc/oprofile/backtrace.c +2
-2@@ -31,7 +31,7 @@ static unsigned int user_getsp32(unsigned int sp, int is_first)unsigned int stack_frame[2 ];void __user *p =compat_ptr (sp); -if (!access_ok (VERIFY_READ , p,sizeof (stack_frame))) +if (!access_ok (p,sizeof (stack_frame)))return 0 ;/* @@ -57,7 +57,7 @@ static unsigned long user_getsp64(unsigned long sp, int is_first) {unsigned long stack_frame[3 ]; -if (!access_ok (VERIFY_READ , (void __user *)sp,sizeof (stack_frame))) +if (!access_ok ((void __user *)sp,sizeof (stack_frame)))return 0 ; if (__copy_from_user_inatomic(stack_frame, (void __user *)sp,arch/powerpc/platforms/cell/spufs/file.c +8
-8@@ -609,7 +609,7 @@ static ssize_t spufs_mbox_read(struct file *file, char __user *buf,if (len <4 )return -EINVAL ; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; udata = (void __user *)buf;@@ -717,7 +717,7 @@ static ssize_t spufs_ibox_read(struct file *file, char __user *buf,if (len <4 )return -EINVAL ; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; udata = (void __user *)buf;@@ -856,7 +856,7 @@ static ssize_t spufs_wbox_write(struct file *file, const char __user *buf,return -EINVAL ; udata = (void __user *)buf; -if (!access_ok (VERIFY_READ , buf, len)) +if (!access_ok (buf, len))return -EFAULT ;if (__get_user (wbox_data, udata))@@ -1994,7 +1994,7 @@ static ssize_t spufs_mbox_info_read(struct file *file, char __user *buf,int ret;struct spu_context *ctx = file->private_data; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; ret =spu_acquire_saved (ctx);@@ -2034,7 +2034,7 @@ static ssize_t spufs_ibox_info_read(struct file *file, char __user *buf,struct spu_context *ctx = file->private_data;int ret; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; ret =spu_acquire_saved (ctx);@@ -2077,7 +2077,7 @@ static ssize_t spufs_wbox_info_read(struct file *file, char __user *buf,struct spu_context *ctx = file->private_data;int ret; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; ret =spu_acquire_saved (ctx);@@ -2129,7 +2129,7 @@ static ssize_t spufs_dma_info_read(struct file *file, char __user *buf,struct spu_context *ctx = file->private_data;int ret; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; ret =spu_acquire_saved (ctx);@@ -2160,7 +2160,7 @@ static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx,if (len < ret)return -EINVAL ; -if (!access_ok (VERIFY_WRITE , buf, len)) +if (!access_ok (buf, len))return -EFAULT ; info.proxydma_info_type = ctx->csa.prob.dma_querytype_RW;arch/powerpc/platforms/powernv/opal-lpc.c +2
-2@@ -192,7 +192,7 @@ static ssize_t lpc_debug_read(struct file *filp, char __user *ubuf,u32 data, pos, len, todo;int rc; -if (!access_ok (VERIFY_WRITE , ubuf, count)) +if (!access_ok (ubuf, count))return -EFAULT ; todo = count;@@ -283,7 +283,7 @@ static ssize_t lpc_debug_write(struct file *filp, const char __user *ubuf,u32 data, pos, len, todo;int rc; -if (!access_ok (VERIFY_READ , ubuf, count)) +if (!access_ok (ubuf, count))return -EFAULT ; todo = count;arch/powerpc/platforms/pseries/scanlog.c +1
-1@@ -63,7 +63,7 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,return -EINVAL ; } -if (!access_ok (VERIFY_WRITE , buf, count)) +if (!access_ok (buf, count))return -EFAULT ;for (;;) {arch/riscv/include/asm/futex.h +1
-1@@ -95,7 +95,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,u32 val;uintptr_t tmp; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;__enable_user_access ();arch/riscv/include/asm/uaccess.h +4
-10@@ -54,14 +54,8 @@ static inline void set_fs(mm_segment_t fs)#define user_addr_max () (get_fs()) -#define VERIFY_READ 0 -#define VERIFY_WRITE 1 -/** * access_ok: - Checks if a user space pointer is valid -* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE. Note that -* %VERIFY_WRITE is a superset of %VERIFY_READ - if it is safe -* to write to a block, it is always safe to read from it. * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -76,7 +70,7 @@ static inline void set_fs(mm_segment_t fs)* checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ -#define access_ok (type, addr, size) ({ \ +#define access_ok (addr, size) ({ \ __chk_user_ptr(addr); \ likely(__access_ok((unsigned long __force)(addr), (size))); \ })@@ -258,7 +252,7 @@ do { \ ({ \ const __typeof__(*(ptr)) __user *__p = (ptr); \might_fault (); \ -access_ok (VERIFY_READ , __p,sizeof (*__p)) ? \ +access_ok (__p,sizeof (*__p)) ? \__get_user ((x), __p) : \ ((x) =0 , -EFAULT ); \ })@@ -386,7 +380,7 @@ do { \ ({ \ __typeof__(*(ptr)) __user *__p = (ptr); \might_fault (); \ -access_ok (VERIFY_WRITE , __p,sizeof (*__p)) ? \ +access_ok (__p,sizeof (*__p)) ? \__put_user ((x), __p) : \ -EFAULT ; \ })@@ -421,7 +415,7 @@ static inlineunsigned long __must_check clear_user (void __user *to,unsigned long n) {might_fault (); -return access_ok (VERIFY_WRITE , to, n) ? +return access_ok (to, n) ?__clear_user (to, n) : n; }arch/riscv/kernel/signal.c +2
-2@@ -115,7 +115,7 @@ SYSCALL_DEFINE0(rt_sigreturn) frame = (struct rt_sigframe __user *)regs->sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))@@ -187,7 +187,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,long err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=copy_siginfo_to_user (&frame->info, &ksig->info);arch/s390/include/asm/uaccess.h +1
-1@@ -48,7 +48,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)__range_ok ((unsigned long )(addr), (size)); \ }) -#define access_ok (type, addr, size) __access_ok(addr, size) +#define access_ok (addr, size) __access_ok(addr, size)unsigned long __must_check raw_copy_from_user (void *to,const void __user *from,unsigned long n);arch/sh/include/asm/checksum_32.h +1
-1@@ -197,7 +197,7 @@ static inline __wsum csum_and_copy_to_user(const void *src, int len, __wsum sum, int *err_ptr) { - if (access_ok(VERIFY_WRITE, dst, len)) + if (access_ok(dst, len)) return csum_partial_copy_generic((__force const void *)src, dst, len, sum, NULL, err_ptr);arch/sh/include/asm/futex.h +1
-1@@ -22,7 +22,7 @@ static inline intfutex_atomic_cmpxchg_inatomic (u32 *uval, u32__user *uaddr, u32 oldval, u32 newval) { -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;return atomic_futex_op_cmpxchg_inatomic (uval, uaddr, oldval, newval);arch/sh/include/asm/uaccess.h +4
-5@@ -18,7 +18,7 @@*/ #define __access_ok (addr, size) \ (__addr_ok((addr) + (size))) -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ (__chk_user_ptr(addr), \ __access_ok((unsigned long __force)(addr), (size)))@@ -66,7 +66,7 @@ struct __large_struct { unsigned long buf[100]; };long __gu_err = -EFAULT ; \unsigned long __gu_val =0 ; \ const __typeof__(*(ptr)) *__gu_addr = (ptr); \ -if (likely (access_ok (VERIFY_READ , __gu_addr, (size)))) \ +if (likely (access_ok (__gu_addr, (size)))) \__get_user_size (__gu_val, __gu_addr, (size), __gu_err); \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ __gu_err; \@@ -87,7 +87,7 @@ struct __large_struct { unsigned long buf[100]; };long __pu_err = -EFAULT ; \ __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ __typeof__(*(ptr)) __pu_val = x; \ -if (likely (access_ok (VERIFY_WRITE , __pu_addr, size))) \ +if (likely (access_ok (__pu_addr, size))) \__put_user_size (__pu_val, __pu_addr, (size), \ __pu_err); \ __pu_err; \@@ -132,8 +132,7 @@ __kernel_size_t __clear_user(void *addr, __kernel_size_t size); void __user * __cl_addr = (addr); \unsigned long __cl_size = (n); \ \ -if (__cl_size &&access_ok (VERIFY_WRITE , \ - ((unsigned long )(__cl_addr)), __cl_size)) \ +if (__cl_size &&access_ok (__cl_addr, __cl_size)) \ __cl_size =__clear_user (__cl_addr, __cl_size); \ \ __cl_size; \arch/sh/kernel/signal_32.c +4
-4@@ -160,7 +160,7 @@ asmlinkage int sys_sigreturn(void)/* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe; if (__get_user(set.sig[0], &frame->sc.oldmask)@@ -190,7 +190,7 @@ asmlinkage int sys_rt_sigreturn(void)/* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))@@ -272,7 +272,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (&ksig->ka, regs->regs[15 ],sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=setup_sigcontext (&frame->sc, regs, set->sig[0 ]);@@ -338,7 +338,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, frame =get_sigframe (&ksig->ka, regs->regs[15 ],sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=copy_siginfo_to_user (&frame->info, &ksig->info);arch/sh/kernel/signal_64.c +4
-4@@ -259,7 +259,7 @@ asmlinkage int sys_sigreturn(unsigned long r2, unsigned long r3,/* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe; if (__get_user(set.sig[0], &frame->sc.oldmask)@@ -293,7 +293,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r2, unsigned long r3,/* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))@@ -379,7 +379,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs frame =get_sigframe (&ksig->ka, regs->regs[REG_SP ],sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=setup_sigcontext (&frame->sc, regs, set->sig[0 ]);@@ -465,7 +465,7 @@ static int setup_rt_frame(struct ksignal *kig, sigset_t *set, frame =get_sigframe (&ksig->ka, regs->regs[REG_SP ],sizeof (*frame)); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; err |=__put_user (&frame->info, &frame->pinfo);arch/sh/kernel/traps_64.c +6
-6@@ -40,7 +40,7 @@ static int read_opcode(reg_size_t pc, insn_size_t *result_opcode, int from_user_/* SHmedia */ aligned_pc = pc & ~3 ;if (from_user_mode) { -if (!access_ok (VERIFY_READ , aligned_pc,sizeof (insn_size_t))) { +if (!access_ok (aligned_pc,sizeof (insn_size_t))) { get_user_error = -EFAULT ; }else { get_user_error =__get_user (opcode, (insn_size_t *)aligned_pc);@@ -180,7 +180,7 @@ static int misaligned_load(struct pt_regs *regs,if (user_mode (regs)) {__u64 buffer; -if (!access_ok (VERIFY_READ , (unsigned long ) address,1UL <<width_shift)) { +if (!access_ok ((unsigned long ) address,1UL <<width_shift)) {return -1 ; }@@ -254,7 +254,7 @@ static int misaligned_store(struct pt_regs *regs,if (user_mode (regs)) {__u64 buffer; -if (!access_ok (VERIFY_WRITE , (unsigned long ) address,1UL <<width_shift)) { +if (!access_ok ((unsigned long ) address,1UL <<width_shift)) {return -1 ; }@@ -327,7 +327,7 @@ static int misaligned_fpu_load(struct pt_regs *regs,__u64 buffer;__u32 buflo, bufhi; -if (!access_ok (VERIFY_READ , (unsigned long ) address,1UL <<width_shift)) { +if (!access_ok ((unsigned long ) address,1UL <<width_shift)) {return -1 ; }@@ -400,7 +400,7 @@ static int misaligned_fpu_store(struct pt_regs *regs,/* Initialise these to NaNs. */ __u32 buflo=0xffffffffUL , bufhi=0xffffffffUL ; -if (!access_ok (VERIFY_WRITE , (unsigned long ) address,1UL <<width_shift)) { +if (!access_ok ((unsigned long ) address,1UL <<width_shift)) {return -1 ; }@@ -663,7 +663,7 @@ void do_reserved_inst(unsigned long error_code, struct pt_regs *regs)/* SHmedia : check for defect. This requires executable vmas to be readable too. */ aligned_pc = pc & ~3 ; -if (!access_ok (VERIFY_READ , aligned_pc,sizeof (insn_size_t))) +if (!access_ok (aligned_pc,sizeof (insn_size_t))) get_user_error = -EFAULT ;else get_user_error =__get_user (opcode, (insn_size_t *)aligned_pc);arch/sh/mm/gup.c +1
-2@@ -177,8 +177,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, addr = start; len = (unsigned long ) nr_pages <<PAGE_SHIFT ; end = start + len; -if (unlikely (!access_ok (write ?VERIFY_WRITE :VERIFY_READ , - (void __user *)start, len))) +if (unlikely (!access_ok ((void __user *)start, len)))return 0 ;/* arch/sh/oprofile/backtrace.c +1
-1@@ -51,7 +51,7 @@ user_backtrace(unsigned long *stackaddr, struct pt_regs *regs)unsigned long buf_stack;/* Also check accessibility of address */ -if (!access_ok (VERIFY_READ , stackaddr,sizeof (unsigned long ))) +if (!access_ok (stackaddr,sizeof (unsigned long )))return NULL ;if (__copy_from_user_inatomic (&buf_stack, stackaddr,sizeof (unsigned long )))arch/sparc/include/asm/checksum_32.h +1
-1@@ -87,7 +87,7 @@ static inline __wsum csum_partial_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err) { - if (!access_ok (VERIFY_WRITE, dst, len)) { + if (!access_ok(dst, len)) { *err = -EFAULT ;return sum; } else {arch/sparc/include/asm/uaccess_32.h +1
-1@@ -39,7 +39,7 @@#define __user_ok (addr, size) ({ (void)(size); (addr) < STACK_TOP; })#define __kernel_ok (uaccess_kernel())#define __access_ok (addr, size) (__user_ok((addr) & get_fs().seg, (size))) -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ ({ (void)(type); __access_ok((unsigned long)(addr), size); })/* arch/sparc/include/asm/uaccess_64.h +1
-1@@ -68,7 +68,7 @@ static inline int __access_ok(const void __user * addr, unsigned long size)return 1 ; } -static inline int access_ok (int type,const void __user * addr,unsigned long size) +static inline int access_ok (const void __user * addr,unsigned long size) {return 1 ; }arch/sparc/kernel/sigutil_32.c +1
-1@@ -65,7 +65,7 @@ int restore_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu)set_used_math ();clear_tsk_thread_flag (current,TIF_USEDFPU ); -if (!access_ok (VERIFY_READ , fpu,sizeof (*fpu))) +if (!access_ok (fpu,sizeof (*fpu)))return -EFAULT ; err = __copy_from_user(¤t->thread.float_regs[0], &fpu->si_float_regs[0],arch/sparc/kernel/unaligned_32.c +3
-4@@ -278,7 +278,6 @@ static inline int ok_for_user(struct pt_regs *regs, unsigned int insn, enum direction dir) {unsigned int reg; -int check = (dir == load) ?VERIFY_READ :VERIFY_WRITE ;int size = ((insn >>19 ) &3 ) ==3 ?8 :4 ;if ((regs->pc | regs->npc) &3 )@@ -290,18 +289,18 @@ static inline int ok_for_user(struct pt_regs *regs, unsigned int insn, reg = (insn >>25 ) &0x1f ;if (reg >=16 ) { -if (!access_ok (check,WINREG_ADDR (reg -16 ), size)) +if (!access_ok (WINREG_ADDR (reg -16 ), size))return -EFAULT ; } reg = (insn >>14 ) &0x1f ;if (reg >=16 ) { -if (!access_ok (check,WINREG_ADDR (reg -16 ), size)) +if (!access_ok (WINREG_ADDR (reg -16 ), size))return -EFAULT ; }if (!(insn &0x2000 )) { reg = (insn &0x1f );if (reg >=16 ) { -if (!access_ok (check,WINREG_ADDR (reg -16 ), size)) +if (!access_ok (WINREG_ADDR (reg -16 ), size))return -EFAULT ; } }arch/um/kernel/ptrace.c +2
-2@@ -66,7 +66,7 @@ long arch_ptrace(struct task_struct *child, long request,#ifdef PTRACE_GETREGS case PTRACE_GETREGS : {/* Get all gp regs from the child. */ -if (!access_ok (VERIFY_WRITE , p,MAX_REG_OFFSET )) { +if (!access_ok (p,MAX_REG_OFFSET )) { ret = -EIO ;break ; }@@ -81,7 +81,7 @@ long arch_ptrace(struct task_struct *child, long request,#ifdef PTRACE_SETREGS case PTRACE_SETREGS : {/* Set all gp regs in the child. */ unsigned long tmp =0 ; -if (!access_ok (VERIFY_READ , p,MAX_REG_OFFSET )) { +if (!access_ok (p,MAX_REG_OFFSET )) { ret = -EIO ;break ; }arch/unicore32/kernel/signal.c +2
-2@@ -117,7 +117,7 @@ asmlinkage int __sys_rt_sigreturn(struct pt_regs *regs) frame = (struct rt_sigframe __user *)regs->UCreg_sp; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (restore_sigframe (regs, &frame->sig))@@ -205,7 +205,7 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,/* * Check that we can actually write to the signal frame. */ -if (!access_ok (VERIFY_WRITE , frame, framesize)) +if (!access_ok (frame, framesize)) frame =NULL ;return frame;arch/x86/entry/vsyscall/vsyscall_64.c +1
-1@@ -99,7 +99,7 @@ static bool write_ok_or_segv(unsigned long ptr, size_t size)* sig_on_uaccess_err, this could go away. */ -if (!access_ok (VERIFY_WRITE , (void __user *)ptr, size)) { +if (!access_ok ((void __user *)ptr, size)) {struct thread_struct *thread = ¤t->thread; thread->error_code =X86_PF_USER |X86_PF_WRITE ;arch/x86/ia32/ia32_aout.c +2
-2@@ -176,10 +176,10 @@ static int aout_core_dump(struct coredump_params *cprm)/* make sure we actually have a data and stack area to dump */ set_fs (USER_DS ); -if (!access_ok (VERIFY_READ , (void *) (unsigned long )START_DATA (dump), +if (!access_ok ((void *) (unsigned long )START_DATA (dump), dump.u_dsize <<PAGE_SHIFT )) dump.u_dsize =0 ; -if (!access_ok (VERIFY_READ , (void *) (unsigned long )START_STACK (dump), +if (!access_ok ((void *) (unsigned long )START_STACK (dump), dump.u_ssize <<PAGE_SHIFT )) dump.u_ssize =0 ;arch/x86/ia32/ia32_signal.c +4
-4@@ -119,7 +119,7 @@ asmlinkage long sys32_sigreturn(void)struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8 );sigset_t set; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe; if (__get_user(set.sig[0], &frame->sc.oldmask) || (_COMPAT_NSIG_WORDS > 1@@ -147,7 +147,7 @@ asmlinkage long sys32_rt_sigreturn(void) frame = (struct rt_sigframe_ia32 __user *)(regs->sp -4 ); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;@@ -269,7 +269,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, frame =get_sigframe (ksig, regs,sizeof (*frame), &fpstate); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;if (__put_user (sig, &frame->sig))@@ -349,7 +349,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, frame =get_sigframe (ksig, regs,sizeof (*frame), &fpstate); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; put_user_try {arch/x86/ia32/sys_ia32.c +1
-1@@ -75,7 +75,7 @@ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat) typeof(ubuf->st_gid) gid = 0;SET_UID (uid,from_kuid_munged (current_user_ns (), stat->uid));SET_GID (gid,from_kgid_munged (current_user_ns (), stat->gid)); - if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) || + if (!access_ok(ubuf, sizeof(struct stat64)) || __put_user(huge_encode_dev(stat->dev), &ubuf->st_dev) || __put_user(stat->ino, &ubuf->__st_ino) || __put_user(stat->ino, &ubuf->st_ino) ||arch/x86/include/asm/checksum_32.h +1
-1@@ -182,7 +182,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,__wsum ret;might_sleep (); -if (access_ok (VERIFY_WRITE , dst, len)) { +if (access_ok (dst, len)) {stac (); ret =csum_partial_copy_generic (src, (__force void *)dst, len, sum,NULL , err_ptr);arch/x86/include/asm/pgtable_32.h +1
-1@@ -37,7 +37,7 @@ void sync_initial_page_table(void);/* * Define this if things work differently on an i386 and an i486: * it will (on an i486) warn about kernel memory accesses that are -* done without a 'access_ok(VERIFY_WRITE,..)' +* done without a 'access_ok( ..)' */ #undef TEST_ACCESS_OKarch/x86/include/asm/uaccess.h +2
-5@@ -77,9 +77,6 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un/** * access_ok: - Checks if a user space pointer is valid -* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE. Note that -* %VERIFY_WRITE is a superset of %VERIFY_READ - if it is safe -* to write to a block, it is always safe to read from it. * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -95,7 +92,7 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un* checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ -#define access_ok (type, addr, size) \ +#define access_ok (addr, size) \ ({ \ WARN_ON_IN_IRQ(); \ likely(!__range_not_ok(addr, size, user_addr_max())); \@@ -670,7 +667,7 @@ extern void __cmpxchg_wrong_size(void)#define user_atomic_cmpxchg_inatomic (uval, ptr, old, new) \ ({ \ - access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \ + access_ok((ptr), sizeof(*(ptr))) ? \ __user_atomic_cmpxchg_inatomic((uval), (ptr), \ (old), (new), sizeof(*(ptr))) : \ -EFAULT; \arch/x86/kernel/fpu/signal.c +2
-2@@ -164,7 +164,7 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size) ia32_fxstate &= (IS_ENABLED (CONFIG_X86_32 ) ||IS_ENABLED (CONFIG_IA32_EMULATION )); -if (!access_ok (VERIFY_WRITE , buf, size)) +if (!access_ok (buf, size))return -EACCES ;if (!static_cpu_has (X86_FEATURE_FPU ))@@ -281,7 +281,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)return 0 ; } -if (!access_ok (VERIFY_READ , buf, size)) +if (!access_ok (buf, size))return -EACCES ;fpu__initialize (fpu);arch/x86/kernel/signal.c +7
-7@@ -322,7 +322,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, frame =get_sigframe (&ksig->ka, regs,sizeof (*frame), &fpstate); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;if (__put_user (sig, &frame->sig))@@ -385,7 +385,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, frame =get_sigframe (&ksig->ka, regs,sizeof (*frame), &fpstate); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ; put_user_try {@@ -465,7 +465,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, frame =get_sigframe (&ksig->ka, regs,sizeof (struct rt_sigframe ), &fp); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;if (ksig->ka.sa.sa_flags &SA_SIGINFO ) {@@ -547,7 +547,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig, frame =get_sigframe (&ksig->ka, regs,sizeof (*frame), &fpstate); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return -EFAULT ;if (ksig->ka.sa.sa_flags &SA_SIGINFO ) {@@ -610,7 +610,7 @@ SYSCALL_DEFINE0(sigreturn) frame = (struct sigframe __user *)(regs->sp -8 ); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe; if (__get_user(set.sig[0], &frame->sc.oldmask) || (_NSIG_WORDS > 1 && __copy_from_user(&set.sig[1], &frame->extramask,@@ -642,7 +642,7 @@ SYSCALL_DEFINE0(rt_sigreturn)unsigned long uc_flags; frame = (struct rt_sigframe __user *)(regs->sp -sizeof (long )); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;@@ -871,7 +871,7 @@ asmlinkage long sys32_x32_rt_sigreturn(void) frame = (struct rt_sigframe_x32 __user *)(regs->sp -8 ); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set))) goto badframe;arch/x86/kernel/stacktrace.c +1
-1@@ -177,7 +177,7 @@ copy_stack_frame(const void __user *fp, struct stack_frame_user *frame) {int ret; -if (!access_ok (VERIFY_READ , fp,sizeof (*frame))) +if (!access_ok (fp,sizeof (*frame)))return 0 ; ret =1 ;arch/x86/kernel/vm86_32.c +2
-2@@ -114,7 +114,7 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval)set_flags (regs->pt.flags,VEFLAGS ,X86_EFLAGS_VIF | vm86->veflags_mask); user = vm86->user_vm86; -if (!access_ok (VERIFY_WRITE , user, vm86->vm86plus.is_vm86pus ? +if (!access_ok (user, vm86->vm86plus.is_vm86pus ?sizeof (struct vm86plus_struct ) :sizeof (struct vm86_struct ))) {pr_alert ("could not access userspace vm86 info\n" );@@ -278,7 +278,7 @@ static long do_sys_vm86(struct vm86plus_struct __user *user_vm86, bool plus)if (vm86->saved_sp0)return -EPERM ; -if (!access_ok (VERIFY_READ , user_vm86, plus ? +if (!access_ok (user_vm86, plus ?sizeof (struct vm86_struct ) :sizeof (struct vm86plus_struct )))return -EFAULT ;arch/x86/lib/csum-wrappers_64.c +2
-2@@ -27,7 +27,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,might_sleep (); *errp =0 ; -if (!likely (access_ok (VERIFY_READ , src, len))) +if (!likely (access_ok (src, len))) goto out_err;/* @@ -89,7 +89,7 @@ csum_partial_copy_to_user(const void *src, void __user *dst,might_sleep (); -if (unlikely (!access_ok (VERIFY_WRITE , dst, len))) { +if (unlikely (!access_ok (dst, len))) { *errp = -EFAULT ;return 0 ; }arch/x86/lib/usercopy_32.c +1
-1@@ -67,7 +67,7 @@ unsigned long clear_user(void __user *to, unsigned long n) {might_fault (); -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n))__do_clear_user (to, n);return n; }arch/x86/lib/usercopy_64.c +1
-1@@ -48,7 +48,7 @@ EXPORT_SYMBOL(__clear_user);unsigned long clear_user (void __user *to,unsigned long n) { -if (access_ok (VERIFY_WRITE , to, n)) +if (access_ok (to, n))return __clear_user (to, n);return n; }arch/x86/math-emu/fpu_system.h +2
-2@@ -104,7 +104,7 @@ static inline bool seg_writable(struct desc_struct *d)#define instruction_address (*(struct address *)&I387->soft.fip)#define operand_address (*(struct address *)&I387->soft.foo) -#define FPU_access_ok (x,y,z) if ( !access_ok(x,y,z) ) \ +#define FPU_access_ok (y,z) if ( !access_ok(y,z) ) \ math_abort(FPU_info,SIGSEGV)#define FPU_abort math_abort(FPU_info, SIGSEGV)@@ -119,7 +119,7 @@ static inline bool seg_writable(struct desc_struct *d)/* A simpler test than access_ok() can probably be done for FPU_code_access_ok() because the only possible error is to step past the upper boundary of a legal code area. */ -#define FPU_code_access_ok (z) FPU_access_ok(VERIFY_READ,(void __user *)FPU_EIP,z) +#define FPU_code_access_ok (z) FPU_access_ok((void __user *)FPU_EIP,z)#endif #define FPU_get_user (x,y) get_user((x),(y))arch/x86/math-emu/load_store.c +3
-3@@ -251,7 +251,7 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes,break ;case 024 :/* fldcw */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , data_address,2 ); +FPU_access_ok (data_address,2 );FPU_get_user (control_word, (unsigned short __user *)data_address);RE_ENTRANT_CHECK_ON ;@@ -291,7 +291,7 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes,break ;case 034 :/* fstcw m16int */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , data_address,2 ); +FPU_access_ok (data_address,2 );FPU_put_user (control_word, (unsigned short __user *)data_address);RE_ENTRANT_CHECK_ON ;@@ -305,7 +305,7 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes,break ;case 036 :/* fstsw m2byte */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , data_address,2 ); +FPU_access_ok (data_address,2 );FPU_put_user (status_word (), (unsigned short __user *)data_address);RE_ENTRANT_CHECK_ON ;arch/x86/math-emu/reg_ld_str.c +24
-24@@ -84,7 +84,7 @@ int FPU_load_extended(long double __user *s, int stnr)FPU_REG *sti_ptr = &st (stnr);RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , s,10 ); +FPU_access_ok (s,10 );__copy_from_user (sti_ptr, s,10 );RE_ENTRANT_CHECK_ON ;@@ -98,7 +98,7 @@ int FPU_load_double(double __user *dfloat, FPU_REG *loaded_data)unsigned m64, l64;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , dfloat,8 ); +FPU_access_ok (dfloat,8 );FPU_get_user (m64,1 + (unsigned long __user *)dfloat);FPU_get_user (l64, (unsigned long __user *)dfloat);RE_ENTRANT_CHECK_ON ;@@ -159,7 +159,7 @@ int FPU_load_single(float __user *single, FPU_REG *loaded_data)int exp, tag, negative;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , single,4 ); +FPU_access_ok (single,4 );FPU_get_user (m32, (unsigned long __user *)single);RE_ENTRANT_CHECK_ON ;@@ -214,7 +214,7 @@ int FPU_load_int64(long long __user *_s)FPU_REG *st0_ptr = &st (0 );RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , _s,8 ); +FPU_access_ok (_s,8 );if (copy_from_user (&s, _s,8 )) FPU_abort;RE_ENTRANT_CHECK_ON ;@@ -243,7 +243,7 @@ int FPU_load_int32(long __user *_s, FPU_REG *loaded_data)int negative;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , _s,4 ); +FPU_access_ok (_s,4 );FPU_get_user (s, _s);RE_ENTRANT_CHECK_ON ;@@ -271,7 +271,7 @@ int FPU_load_int16(short __user *_s, FPU_REG *loaded_data)int s, negative;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , _s,2 ); +FPU_access_ok (_s,2 );/* Cast as short to get the sign extended. */ FPU_get_user (s, _s);RE_ENTRANT_CHECK_ON ;@@ -304,7 +304,7 @@ int FPU_load_bcd(u_char __user *s)int sign;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , s,10 ); +FPU_access_ok (s,10 );RE_ENTRANT_CHECK_ON ;for (pos =8 ; pos >=0 ; pos--) { l *=10 ;@@ -345,7 +345,7 @@ int FPU_store_extended(FPU_REG *st0_ptr, u_char st0_tag,if (st0_tag != TAG_Empty) {RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,10 ); +FPU_access_ok (d,10 );FPU_put_user (st0_ptr->sigl, (unsigned long __user *)d); FPU_put_user(st0_ptr->sigh,@@ -364,7 +364,7 @@ int FPU_store_extended(FPU_REG *st0_ptr, u_char st0_tag,/* The masked response */ /* Put out the QNaN indefinite */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,10 ); +FPU_access_ok (d,10 );FPU_put_user (0 , (unsigned long __user *)d);FPU_put_user (0xc0000000 ,1 + (unsigned long __user *)d);FPU_put_user (0xffff ,4 + (short __user *)d);@@ -539,7 +539,7 @@ int FPU_store_double(FPU_REG *st0_ptr, u_char st0_tag, double __user *dfloat)/* The masked response */ /* Put out the QNaN indefinite */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , dfloat,8 ); +FPU_access_ok (dfloat,8 );FPU_put_user (0 , (unsigned long __user *)dfloat);FPU_put_user (0xfff80000 ,1 + (unsigned long __user *)dfloat);@@ -552,7 +552,7 @@ int FPU_store_double(FPU_REG *st0_ptr, u_char st0_tag, double __user *dfloat) l[1 ] |=0x80000000 ;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , dfloat,8 ); +FPU_access_ok (dfloat,8 );FPU_put_user (l[0 ], (unsigned long __user *)dfloat);FPU_put_user (l[1 ],1 + (unsigned long __user *)dfloat);RE_ENTRANT_CHECK_ON ;@@ -724,7 +724,7 @@ int FPU_store_single(FPU_REG *st0_ptr, u_char st0_tag, float __user *single)/* The masked response */ /* Put out the QNaN indefinite */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , single,4 ); +FPU_access_ok (single,4 );FPU_put_user (0xffc00000 , (unsigned long __user *)single);RE_ENTRANT_CHECK_ON ;@@ -742,7 +742,7 @@ int FPU_store_single(FPU_REG *st0_ptr, u_char st0_tag, float __user *single) templ |=0x80000000 ;RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , single,4 ); +FPU_access_ok (single,4 );FPU_put_user (templ, (unsigned long __user *)single);RE_ENTRANT_CHECK_ON ;@@ -791,7 +791,7 @@ int FPU_store_int64(FPU_REG *st0_ptr, u_char st0_tag, long long __user *d) }RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,8 ); +FPU_access_ok (d,8 );if (copy_to_user (d, &tll,8 )) FPU_abort;RE_ENTRANT_CHECK_ON ;@@ -838,7 +838,7 @@ int FPU_store_int32(FPU_REG *st0_ptr, u_char st0_tag, long __user *d) }RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,4 ); +FPU_access_ok (d,4 );FPU_put_user (t.sigl, (unsigned long __user *)d);RE_ENTRANT_CHECK_ON ;@@ -884,7 +884,7 @@ int FPU_store_int16(FPU_REG *st0_ptr, u_char st0_tag, short __user *d) }RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,2 ); +FPU_access_ok (d,2 );FPU_put_user ((short )t.sigl, d);RE_ENTRANT_CHECK_ON ;@@ -925,7 +925,7 @@ int FPU_store_bcd(FPU_REG *st0_ptr, u_char st0_tag, u_char __user *d)if (control_word & CW_Invalid) {/* Produce the QNaN "indefinite" */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,10 ); +FPU_access_ok (d,10 );for (i =0 ; i <7 ; i++)FPU_put_user (0 , d + i);/* These bytes "undefined" */ FPU_put_user (0xc0 , d +7 );/* This byte "undefined" */ @@ -941,7 +941,7 @@ int FPU_store_bcd(FPU_REG *st0_ptr, u_char st0_tag, u_char __user *d) }RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,10 ); +FPU_access_ok (d,10 );RE_ENTRANT_CHECK_ON ;for (i =0 ; i <9 ; i++) { b =FPU_div_small (&ll,10 );@@ -1034,7 +1034,7 @@ u_char __user *fldenv(fpu_addr_modes addr_modes, u_char __user *s) ((addr_modes.default_mode == PM16) ^ (addr_modes.override.operand_size == OP_SIZE_PREFIX))) {RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , s,0x0e ); +FPU_access_ok (s,0x0e );FPU_get_user (control_word, (unsigned short __user *)s);FPU_get_user (partial_status, (unsigned short __user *)(s +2 ));FPU_get_user (tag_word, (unsigned short __user *)(s +4 ));@@ -1056,7 +1056,7 @@ u_char __user *fldenv(fpu_addr_modes addr_modes, u_char __user *s) } }else {RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , s,0x1c ); +FPU_access_ok (s,0x1c );FPU_get_user (control_word, (unsigned short __user *)s);FPU_get_user (partial_status, (unsigned short __user *)(s +4 ));FPU_get_user (tag_word, (unsigned short __user *)(s +8 ));@@ -1125,7 +1125,7 @@ void frstor(fpu_addr_modes addr_modes, u_char __user *data_address)/* Copy all registers in stack order. */ RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_READ , s,80 ); +FPU_access_ok (s,80 );__copy_from_user (register_base + offset, s, other);if (offset)__copy_from_user (register_base, s + other, offset);@@ -1146,7 +1146,7 @@ u_char __user *fstenv(fpu_addr_modes addr_modes, u_char __user *d) ((addr_modes.default_mode == PM16) ^ (addr_modes.override.operand_size == OP_SIZE_PREFIX))) {RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,14 ); +FPU_access_ok (d,14 );#ifdef PECULIAR_486 FPU_put_user (control_word & ~0xe080 , (unsigned long __user *)d);#else @@ -1174,7 +1174,7 @@ u_char __user *fstenv(fpu_addr_modes addr_modes, u_char __user *d) d +=0x0e ; }else {RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,7 *4 ); +FPU_access_ok (d,7 *4 );#ifdef PECULIAR_486 control_word &= ~0xe080 ;/* An 80486 sets nearly all of the reserved bits to 1. */ @@ -1204,7 +1204,7 @@ void fsave(fpu_addr_modes addr_modes, u_char __user *data_address) d =fstenv (addr_modes, data_address);RE_ENTRANT_CHECK_OFF ; -FPU_access_ok (VERIFY_WRITE , d,80 ); +FPU_access_ok (d,80 );/* Copy all registers in stack order. */ if (__copy_to_user (d, register_base + offset, other))arch/x86/mm/mpx.c +1
-1@@ -495,7 +495,7 @@ static int get_bt_addr(struct mm_struct *mm,unsigned long bd_entry;unsigned long bt_addr; -if (!access_ok (VERIFY_READ , (bd_entry_ptr),sizeof (*bd_entry_ptr))) +if (!access_ok ((bd_entry_ptr),sizeof (*bd_entry_ptr)))return -EFAULT ;while (1 ) {arch/x86/um/asm/checksum_32.h +1
-1@@ -43,7 +43,7 @@ static __inline__ __wsum csum_and_copy_to_user(const void *src,void __user *dst, int len, __wsum sum, int *err_ptr) { - if (access_ok(VERIFY_WRITE, dst, len)) { + if (access_ok(dst, len)) { if (copy_to_user(dst, src, len)) { *err_ptr = -EFAULT ;return (__force __wsum)-1 ;arch/x86/um/signal.c +3
-3@@ -367,7 +367,7 @@ int setup_signal_stack_sc(unsigned long stack_top, struct ksignal *ksig,/* This is the same calculation as i386 - ((sp + 4) & 15) == 0 */ stack_top = ((stack_top +4 ) &-16UL ) -4 ; frame = (struct sigframe __user *) stack_top -1 ; -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return 1 ; restorer = frame->retcode;@@ -412,7 +412,7 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig, stack_top &=-8UL ; frame = (struct rt_sigframe __user *) stack_top -1 ; -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame)))return 1 ; restorer = frame->retcode;@@ -497,7 +497,7 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,/* Subtract 128 for a red zone and 8 for proper alignment */ frame = (struct rt_sigframe __user *) ((unsigned long ) frame -128 -8 ); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto out;if (ksig->ka.sa.sa_flags &SA_SIGINFO ) {arch/xtensa/include/asm/checksum.h +1
-1@@ -243,7 +243,7 @@ static __inline__ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) { - if (access_ok(VERIFY_WRITE, dst, len)) + if (access_ok(dst, len)) return csum_partial_copy_generic(src,dst,len,sum,NULL,err_ptr);if (len)arch/xtensa/include/asm/futex.h +1
-1@@ -93,7 +93,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, {int ret =0 ; -if (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))) +if (!access_ok (uaddr,sizeof (u32)))return -EFAULT ;#if !XCHAL_HAVE_S32C1I arch/xtensa/include/asm/uaccess.h +5
-5@@ -42,7 +42,7 @@#define __user_ok (addr, size) \ (((size) <= TASK_SIZE)&&((addr) <= TASK_SIZE-(size)))#define __access_ok (addr, size) (__kernel_ok || __user_ok((addr), (size))) -#define access_ok (type, addr, size) __access_ok((unsigned long)(addr), (size)) +#define access_ok (addr, size) __access_ok((unsigned long)(addr), (size))#define user_addr_max () (uaccess_kernel() ? ~0UL : TASK_SIZE)@@ -86,7 +86,7 @@ extern long __put_user_bad(void); ({ \long __pu_err = -EFAULT ; \__typeof__ (*(ptr)) *__pu_addr = (ptr); \ -if (access_ok (VERIFY_WRITE , __pu_addr, size)) \ +if (access_ok (__pu_addr, size)) \__put_user_size ((x), __pu_addr, (size), __pu_err); \ __pu_err; \ })@@ -183,7 +183,7 @@ __asm__ __volatile__( \ ({ \ long __gu_err = -EFAULT, __gu_val = 0; \ const __typeof__(*(ptr)) *__gu_addr = (ptr); \ - if (access_ok(VERIFY_READ, __gu_addr, size)) \ + if (access_ok(__gu_addr, size)) \ __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ __gu_err; \@@ -269,7 +269,7 @@ __xtensa_clear_user(void *addr, unsigned long size)static inline unsigned long clear_user (void *addr,unsigned long size) { -if (access_ok (VERIFY_WRITE , addr, size)) +if (access_ok (addr, size))return __xtensa_clear_user (addr, size);return size ? -EFAULT :0 ; }@@ -284,7 +284,7 @@ extern long __strncpy_user(char *, const char *, long);static inline long strncpy_from_user (char *dst,const char *src,long count) { -if (access_ok (VERIFY_READ , src,1 )) +if (access_ok (src,1 ))return __strncpy_user (dst, src, count);return -EFAULT ; }arch/xtensa/kernel/signal.c +2
-2@@ -251,7 +251,7 @@ asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3, frame = (struct rt_sigframe __user *) regs->areg[1 ]; -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) +if (!access_ok (frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))@@ -348,7 +348,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,if (regs->depc >64 )panic ("Double exception sys_sigreturn\n" ); -if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame))) { +if (!access_ok (frame,sizeof (*frame))) {return -EFAULT ; }arch/xtensa/kernel/stacktrace.c +1
-1@@ -91,7 +91,7 @@ void xtensa_backtrace_user(struct pt_regs *regs, unsigned int depth, pc =MAKE_PC_FROM_RA (a0, pc);/* Check if the region is OK to access. */ -if (!access_ok (VERIFY_READ , &SPILL_SLOT (a1,0 ),8 )) +if (!access_ok (&SPILL_SLOT (a1,0 ),8 ))return ;/* Copy a1, a0 from user space stack frame. */ if (__get_user(a0, &SPILL_SLOT(a1, 0)) ||drivers/acpi/acpi_dbg.c +2
-2@@ -614,7 +614,7 @@ static ssize_t acpi_aml_read(struct file *file, char __user *buf,Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +6
-12Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/i915_gem_execbuffer.c +3
-3Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/i915_gem_userptr.c +1
-2Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/hfi1/user_exp_rcv.c +1
-1Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/qib/qib_file_ops.c +1
-1Lines of this file are not shown. View the raw message.
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +23
-23Lines of this file are not shown. View the raw message.
drivers/platform/goldfish/goldfish_pipe.c +1
-2Lines of this file are not shown. View the raw message.
drivers/staging/comedi/comedi_compat32.c +12
-12Lines of this file are not shown. View the raw message.
drivers/usb/gadget/udc/atmel_usba_udc.c +1
-1Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.7.4
Part of the diff is not shown here. View the raw message.
Quoted 2 lines · Guenter Roeck
... and this is just the very first build I happened to try this morning.
It will fail for all sparc32 builds. And unlike the powerpc case, I hadn't even noticed this one.
Trivial fix for powerpc/sparc32 pushed out. Hopefully that was all of it.
Linus
Quoted 9 lines · Linus Torvalds
Quoted 2 lines · Guenter Roeck
... and this is just the very first build I happened to try this morning.
It will fail for all sparc32 builds. And unlike the powerpc case, I hadn't even noticed this one.
Trivial fix for powerpc/sparc32 pushed out. Hopefully that was all of it.
Confirmed. The only build breakages as of right now are imx_v6_v7_defconfig and all h8300 builds, as before. Patches are pending for both.
Guenter