Commit a5018b0e authored by Luc Van Oostenryck's avatar Luc Van Oostenryck Committed by Will Deacon

arm64: fix endianness annotation for debug-monitors.c

Here we're reading thumb or ARM instructions, which are always
stored in memory in little-endian order. These values are thus
correctly converted to native order but the intermediate value
should be annotated as for little-endian values.

Fix this by declaring the intermediate var as __le32 or __le16.
Signed-off-by: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 0607512d
...@@ -341,20 +341,22 @@ int aarch32_break_handler(struct pt_regs *regs) ...@@ -341,20 +341,22 @@ int aarch32_break_handler(struct pt_regs *regs)
if (compat_thumb_mode(regs)) { if (compat_thumb_mode(regs)) {
/* get 16-bit Thumb instruction */ /* get 16-bit Thumb instruction */
get_user(thumb_instr, (u16 __user *)pc); __le16 instr;
thumb_instr = le16_to_cpu(thumb_instr); get_user(instr, (__le16 __user *)pc);
thumb_instr = le16_to_cpu(instr);
if (thumb_instr == AARCH32_BREAK_THUMB2_LO) { if (thumb_instr == AARCH32_BREAK_THUMB2_LO) {
/* get second half of 32-bit Thumb-2 instruction */ /* get second half of 32-bit Thumb-2 instruction */
get_user(thumb_instr, (u16 __user *)(pc + 2)); get_user(instr, (__le16 __user *)(pc + 2));
thumb_instr = le16_to_cpu(thumb_instr); thumb_instr = le16_to_cpu(instr);
bp = thumb_instr == AARCH32_BREAK_THUMB2_HI; bp = thumb_instr == AARCH32_BREAK_THUMB2_HI;
} else { } else {
bp = thumb_instr == AARCH32_BREAK_THUMB; bp = thumb_instr == AARCH32_BREAK_THUMB;
} }
} else { } else {
/* 32-bit ARM instruction */ /* 32-bit ARM instruction */
get_user(arm_instr, (u32 __user *)pc); __le32 instr;
arm_instr = le32_to_cpu(arm_instr); get_user(instr, (__le32 __user *)pc);
arm_instr = le32_to_cpu(instr);
bp = (arm_instr & ~0xf0000000) == AARCH32_BREAK_ARM; bp = (arm_instr & ~0xf0000000) == AARCH32_BREAK_ARM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment