Skip to content

Commit

Permalink
arm64: module: ensure instruction is little-endian before manipulation
Browse files Browse the repository at this point in the history
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 <will.deacon@arm.com>
Tested-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Will Deacon authored and Catalin Marinas committed Nov 5, 2013
1 parent dab7ea3 commit 122e2fa
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/arm64/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
/*
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 122e2fa

Please sign in to comment.