xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: module: ensure instruction is little-endian before manipulation

Browse Source 
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>
This commit is contained in:
Will Deacon
2013-11-05 10:16:52 +00:00
committed by Catalin Marinas
parent dab7ea3609
commit 122e2fa0d3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/kernel/module.c
View File

@@ -111,6 +111,9 @@ static u32 encode_insn_immediate(enum aarch64_imm_type type, u32 insn, u64 imm)
u32 immlo, immhi, lomask, himask, mask; u32 immlo, immhi, lomask, himask, mask;
int shift; int shift;
/* The instruction stream is always little endian. */
insn = le32_to_cpu(insn);
switch (type) { switch (type) {
case INSN_IMM_MOVNZ: 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 &= ~(mask << shift);
insn |= (imm & 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, static int reloc_insn_movw(enum aarch64_reloc_op op, void *place, u64 val,