diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-11-07 15:07:05 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-01-03 16:34:36 +0100 |
| commit | 67c75057709a6d85c681c78b9b2f9b71191f01a2 (patch) | |
| tree | 6000e8a3cabb256df677a465edc1e48cbc1f3d59 /arch/mips/kernel/process.c | |
| parent | b6c7a324df37bf05ef7a2c1580683cf10d082d97 (diff) | |
| download | linux-stable-67c75057709a6d85c681c78b9b2f9b71191f01a2.tar.gz linux-stable-67c75057709a6d85c681c78b9b2f9b71191f01a2.tar.bz2 linux-stable-67c75057709a6d85c681c78b9b2f9b71191f01a2.zip | |
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: Paul Burton <paul.burton@imgtec.com>
Fixes: 34c2f668d0f6 ("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: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/process.c')
| -rw-r--r-- | arch/mips/kernel/process.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 9f7a19ca1d4c..e03113493580 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -242,9 +242,14 @@ static inline int is_jump_ins(union mips_instruction *ip) * * microMIPS is kind of more fun... */ - if ((ip->mm16_r5_format.opcode == mm_pool16c_op && - (ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op) || - ip->j_format.opcode == mm_jal32_op) + if (mm_insn_16bit(ip->halfword[1])) { + if ((ip->mm16_r5_format.opcode == mm_pool16c_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; if (ip->r_format.opcode != mm_pool32a_op || ip->r_format.func != mm_pool32axf_op) |