Will Deacon 72b31b6685 ARM: 6489/1: thumb2: fix incorrect optimisation in usracc ...

commit 1142b71d85 upstream.

Commit 8b592783 added a Thumb-2 variant of usracc which, when it is
called with \rept=2, calls usraccoff once with an offset of 0 and
secondly with a hard-coded offset of 4 in order to avoid incrementing
the pointer again. If \inc != 4 then we will store the data to the wrong
offset from \ptr. Luckily, the only caller that passes \rept=2 to this
function is __clear_user so we haven't been actively corrupting user data.

This patch fixes usracc to pass \inc instead of #4 to usraccoff
when it is called a second time.

Reported-by: Tony Thompson <tony.thompson@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-12-09 13:27:03 -08:00

..

hardware

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop

2009-10-02 22:31:04 +01:00

mach

ARM: 5720/1: Move MMCI header to amba include dir

2009-09-22 20:49:04 +01:00

a.out-core.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

a.out.h

headers_check fix: arm, a.out.h

2009-02-01 11:01:22 +05:30

assembler.h

ARM: 6489/1: thumb2: fix incorrect optimisation in usracc

2010-12-09 13:27:03 -08:00

atomic.h

Clear the exclusive monitor when returning from an exception

2009-09-18 23:30:11 +01:00

auxvec.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

bitops.h

ARM: boolean bit testing

2009-10-11 16:25:06 +01:00

bitsperlong.h

asm-generic: introduce asm/bitsperlong.h

2009-06-11 21:02:14 +02:00

bug.h

[ARM] 5211/2: fix a couple warnings from BUG() usage

2008-09-01 12:06:27 +01:00

bugs.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

byteorder.h

byteorder: make swab.h include asm/swab.h like a regular header

2009-01-14 19:56:50 -08:00

cache.h

ARM: 5700/1: ARM: Introduce ARM_L1_CACHE_SHIFT to define cache line size

2009-09-15 22:06:38 +01:00

cacheflush.h

ARM: Fix errata 411920 workarounds

2009-10-29 19:13:09 +00:00

cachetype.h

[ARM] Introduce new bitmask based cache type macros

2008-09-25 15:35:28 +01:00

checksum.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

clkdev.h

[ARM] clkdev: add generic clkdev infrastructure

2008-11-27 12:38:21 +00:00

cpu-multi32.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

cpu-single.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

cpu.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

cputime.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

cputype.h

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

2009-09-21 16:02:30 +01:00

current.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

delay.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

device.h

Driver Core: Add platform device arch data V3

2009-07-22 00:28:38 +02:00

div64.h

[ARM] 5320/1: fix assembly constraints in implementation of do_div()

2008-10-23 12:53:32 +01:00

dma-mapping.h

[ARM] make page_to_dma() highmem aware

2009-03-15 21:01:21 -04:00

dma.h

[ARM] dma: remove dmamode_t typedef

2009-01-02 12:34:55 +00:00

domain.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ecard.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

elf.h

ARM: 5759/1: Add register information of threads to coredump

2009-10-14 10:33:05 +01:00

emergency-restart.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

errno.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

fb.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

fcntl.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

fiq.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

fixmap.h

[ARM] fixmap support

2009-03-15 21:01:20 -04:00

flat.h

flat: fix data sections alignment

2009-05-29 08:40:02 -07:00

floppy.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

fpstate.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ftrace.h

Merge branch 'devel-stable' into devel

2009-09-12 12:02:26 +01:00

futex.h

Thumb-2: Implementation of the unified start-up and exceptions code

2009-07-24 12:32:54 +01:00

glue.h

ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()

2009-10-02 22:34:32 +01:00

gpio.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

hardirq.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

highmem.h

[ARM] introduce dma_cache_maint_page()

2009-03-15 21:01:21 -04:00

hw_irq.h

[ARM] Fix circular include dependency with IRQ headers

2008-08-07 09:39:37 +01:00

hwcap.h

[ARM] 5388/1: Add hwcap bits for VFPv3 and VFPv3D16

2009-02-12 10:59:44 +00:00

ide.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

io.h

[ARM] Add a common typesafe __io implementation

2008-11-30 11:45:54 +00:00

ioctl.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ioctls.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ipcbuf.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

irq_regs.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

irq.h

[ARM] give RiscPC a NR_IRQS definition and remove default

2008-11-29 19:14:31 +00:00

irqflags.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

Kbuild

byteorder: make swab.h include asm/swab.h like a regular header

2009-01-14 19:56:50 -08:00

kdebug.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

kexec.h

kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE

2008-08-15 08:35:42 -07:00

kgdb.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

kmap_types.h

[ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled

2009-11-20 14:23:36 +00:00

kprobes.h

[ARM] 5206/1: remove kprobe_trap_handler() hack

2008-09-01 12:06:26 +01:00

leds.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

limits.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

linkage.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

local.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

localtimer.h

[ARM] smp: allow re-use of realview localtimer TWD support

2009-05-17 19:16:41 +01:00

locks.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

mc146818rtc.h

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

memory.h

Merge branch 'master' into devel

2009-09-12 12:04:37 +01:00

mman.h

untangle the do_mremap() mess

2010-01-18 10:19:11 -08:00

mmu_context.h

cpumask: use mm_cpumask() wrapper: arm

2009-09-24 09:34:49 +09:30

mmu.h

NOMMU: Make VMAs per MM as for MMU-mode linux

2009-01-08 12:04:47 +00:00

mmzone.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

module.h

[ARM] 5384/1: unwind: Add stack unwinding support for loadable modules

2009-02-19 11:27:19 +00:00

msgbuf.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

mtd-xip.h

[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h

2008-12-14 13:22:51 +00:00

mutex.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

nwflash.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

page-nommu.h

nommu: Remove the memory_start/end variables from ARM page-nommu.h

2009-07-24 12:35:01 +01:00

page.h

ARM: Fix pfn_valid() for sparse memory

2009-09-12 11:48:09 +01:00

param.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

parport.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pci.h

PCI: remove pcibios_scan_all_fns()

2009-09-09 13:29:18 -07:00

percpu.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pgalloc.h

ARM: implement highpte

2009-08-17 20:02:06 +01:00

pgtable-hwdef.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pgtable-nommu.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pgtable.h

ARM: implement highpte

2009-08-17 20:02:06 +01:00

poll.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

posix_types.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

proc-fns.h

Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

2009-03-26 23:10:11 +00:00

processor.h

Add core support for ARMv6/v7 big-endian

2009-05-30 14:00:18 +01:00

procinfo.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ptrace.h

ARM: Tighten check for allowable CPSR values

2010-08-26 16:41:40 -07:00

resource.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

scatterlist.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

sections.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

segment.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

sembuf.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

serial.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

setup.h

ARM: Fix broken highmem support

2009-08-15 12:36:00 +01:00

shmbuf.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

shmparam.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

sigcontext.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

siginfo.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

signal.h

asm-generic: rename termios.h, signal.h and mman.h

2009-06-11 21:01:52 +02:00

sizes.h

[ARM] Kirkwood: create a mapping for the Security Accelerator SRAM

2009-06-08 13:05:02 -04:00

smp_plat.h

ARM: Don't allow highmem on SMP platforms without h/w TLB ops broadcast

2009-09-28 18:06:20 +01:00

smp_scu.h

[ARM] smp: separate SCU support code from realview

2009-05-17 19:00:37 +01:00

smp_twd.h

[ARM] smp: allow re-use of realview localtimer TWD support

2009-05-17 19:16:41 +01:00

smp.h

cpumask: remove arch_send_call_function_ipi

2009-09-24 09:34:47 +09:30

socket.h

net: implement a SO_DOMAIN getsockoption

2009-08-05 13:02:57 -07:00

sockios.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

sparsemem.h

[ARM] mm: enable sparsemem on clps7500 and RiscPC

2008-10-01 17:24:04 +01:00

spinlock_types.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

spinlock.h

Allow rwlocks to re-enable interrupts

2009-04-02 19:05:11 -07:00

stacktrace.h

[ARM] 5382/1: unwind: Reorganise the stacktrace support

2009-02-12 13:21:17 +00:00

stat.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

statfs.h

ARM: Use <asm-generic/statfs.h>

2008-09-04 09:46:11 +01:00

string.h

[ARM] remove memzero()

2008-11-27 12:37:59 +00:00

swab.h

headers_check fix: arm, swab.h

2009-02-01 11:01:23 +05:30

system.h

[ARM] Add cmpxchg support for ARMv6+ systems (v5)

2009-05-28 21:10:31 +01:00

tcm.h

ARM: 5580/2: ARM TCM (Tightly-Coupled Memory) support v3

2009-09-15 22:11:05 +01:00

termbits.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

termios.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

therm.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

thread_info.h

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

2009-09-14 17:48:14 -07:00

thread_notify.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

timex.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

tlb.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

tlbflush.h

ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID

2010-08-13 13:19:39 -07:00

topology.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

traps.h

[ARM] 5381/1: unwind: Reorganise the traps.c code

2009-02-12 13:21:15 +00:00

types.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

uaccess.h

Thumb-2: Implement the unified arch/arm/lib functions

2009-07-24 12:32:57 +01:00

ucontext.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

unaligned.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

unified.h

Fix "W" macro in arch/arm/include/asm/unified.h

2009-09-18 23:30:11 +01:00

unistd.h

ARM: Use a definition for the userspace cmpxchg emulation syscall

2009-11-10 08:41:12 +00:00

unwind.h

[ARM] 5383/2: unwind: Add core support for ARM stack unwinding

2009-02-19 11:26:24 +00:00

user.h

[ARM] 5387/1: Add ptrace VFP support on ARM

2009-02-12 10:59:43 +00:00

vfp.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

vfpmacros.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

vga.h

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

xor.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00