path: root/arch/arm/mm
diff options
authorMarc Zyngier <Marc.Zyngier@arm.com>2013-11-04 11:42:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-11-07 00:15:49 +0000
commite16b31bf47738f4498d7ce632e12d7d2a6a2492a (patch)
tree32816ec7e20243cdfc3266a07f514e8b002664d3 /arch/arm/mm
parent384b38b66947b06999b3e39a596d4f2fb94f77e4 (diff)
ARM: 7876/1: clear Thumb-2 IT state on exception handling
The exception handling code fails to clear the IT state, potentially leading to incorrect execution of the fixup if the size of the IT block is more than one. Let fixup_exception do the IT sanitizing if a fixup has been found, and restore CPSR from the stack when returning from a data abort. Cc: Will Deacon <will.deacon@arm.com> Cc: stable@vger.kernel.org Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mm/extable.c b/arch/arm/mm/extable.c
index 9d285626bc7..312e15e6d00 100644
--- a/arch/arm/mm/extable.c
+++ b/arch/arm/mm/extable.c
@@ -9,8 +9,13 @@ int fixup_exception(struct pt_regs *regs)
const struct exception_table_entry *fixup;
fixup = search_exception_tables(instruction_pointer(regs));
- if (fixup)
+ if (fixup) {
regs->ARM_pc = fixup->fixup;
+ /* Clear the IT state to avoid nasty surprises in the fixup */
+ regs->ARM_cpsr &= ~PSR_IT_MASK;
+ }
return fixup != NULL;