Commit 67c75057 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle

MIPS: Fix is_jump_ins() handling of 16b microMIPS instructions

is_jump_ins() checks 16b instruction fields without verifying that the
instruction is indeed 16b, as is done by is_ra_save_ins() &
is_sp_move_ins(). Add the appropriate check.
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Fixes: 34c2f668 ("MIPS: microMIPS: Add unaligned access support.")
Cc: Leonid Yegoshin <leonid.yegoshin@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # v3.10+
Patchwork: https://patchwork.linux-mips.org/patch/14531/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b6c7a324
...@@ -242,9 +242,14 @@ static inline int is_jump_ins(union mips_instruction *ip) ...@@ -242,9 +242,14 @@ static inline int is_jump_ins(union mips_instruction *ip)
* *
* microMIPS is kind of more fun... * microMIPS is kind of more fun...
*/ */
if ((ip->mm16_r5_format.opcode == mm_pool16c_op && if (mm_insn_16bit(ip->halfword[1])) {
(ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op) || if ((ip->mm16_r5_format.opcode == mm_pool16c_op &&
ip->j_format.opcode == mm_jal32_op) (ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op))
return 1;
return 0;
}
if (ip->j_format.opcode == mm_jal32_op)
return 1; return 1;
if (ip->r_format.opcode != mm_pool32a_op || if (ip->r_format.opcode != mm_pool32a_op ||
ip->r_format.func != mm_pool32axf_op) ip->r_format.func != mm_pool32axf_op)
......
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