From: Will Deacon Date: Tue, 5 Nov 2013 10:16:52 +0000 (+0000) Subject: arm64: module: ensure instruction is little-endian before manipulation X-Git-Tag: MMI-PSA29.97-13-9~13356^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=122e2fa0d310d262cb85cf0b003032e5d2bc2ae7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git arm64: module: ensure instruction is little-endian before manipulation Relocations that require an instruction immediate to be re-encoded must ensure that the instruction pattern is represented in a little-endian format for the manipulation code to work correctly. This patch converts the loaded instruction into native-endianess prior to encoding and then converts back to little-endian byteorder before updating memory. Signed-off-by: Will Deacon Tested-by: Matthew Leach Signed-off-by: Catalin Marinas --- diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index ca0e3d55da99..2c28a6cf93e6 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c @@ -111,6 +111,9 @@ static u32 encode_insn_immediate(enum aarch64_imm_type type, u32 insn, u64 imm) u32 immlo, immhi, lomask, himask, mask; int shift; + /* The instruction stream is always little endian. */ + insn = le32_to_cpu(insn); + switch (type) { case INSN_IMM_MOVNZ: /* @@ -179,7 +182,7 @@ static u32 encode_insn_immediate(enum aarch64_imm_type type, u32 insn, u64 imm) insn &= ~(mask << shift); insn |= (imm & mask) << shift; - return insn; + return cpu_to_le32(insn); } static int reloc_insn_movw(enum aarch64_reloc_op op, void *place, u64 val,