summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2010-11-19 13:18:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-21 22:05:58 +0000
commit1142b71d85894dcff1466dd6c871ea3c89e0352c (patch)
tree57ff6436b35a8952c46e66acac9616342271886f /arch/arm/boot
parent8fbb97a2bc9b8c91b5a4588ba80709e48dad3f16 (diff)
downloadlinux-1142b71d85894dcff1466dd6c871ea3c89e0352c.tar.gz
linux-1142b71d85894dcff1466dd6c871ea3c89e0352c.tar.bz2
linux-1142b71d85894dcff1466dd6c871ea3c89e0352c.zip
ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
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. Cc: <stable@kernel.org> 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>
Diffstat (limited to 'arch/arm/boot')
0 files changed, 0 insertions, 0 deletions