Commit d6cd9894 authored Jan 10, 2014 by Taras Kondratiuk Committed by Russell King Jan 11, 2014

ARM: 7939/1: traps: fix opcode endianness when read from user memory



Currently code has an inverted logic: opcode from user memory
is swapped to a proper endianness only in case of read error.
While normally opcode should be swapped only if it was read
correctly from user memory.

Reviewed-by: Victor Kamensky <victor.kamensky@linaro.org>
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 261521f1

arch/arm/kernel/traps.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -431,9 +431,10 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
		instr2 = __mem_to_opcode_thumb16(instr2);
		instr = __opcode_thumb32_compose(instr, instr2);
		}
		} else if (get_user(instr, (u32 __user *)pc)) {
		instr = __mem_to_opcode_arm(instr);
		} else {
		if (get_user(instr, (u32 __user *)pc))
		goto die_sig;
		instr = __mem_to_opcode_arm(instr);
		}

		if (call_undef_hook(regs, instr) == 0)