shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
commit 67c7505770 upstream.

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: Paul Burton <paul.burton@imgtec.com>
Fixes: 34c2f668d0 ("MIPS: microMIPS: Add unaligned access support.")
Cc: Leonid Yegoshin <leonid.yegoshin@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14531/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paul Burton
2016-11-07 15:07:05 +00:00
committed by Greg Kroah-Hartman
parent 72a0cfae59
commit d75d675a05
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/mips/kernel/process.c
View File

@@ -237,9 +237,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)