Path: csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod From: Willy Tarreau Newsgroups: linux.kernel Subject: [PATCH 3.10 145/250] MIPS: Fix is_jump_ins() handling of 16b microMIPS instructions Date: Thu, 08 Jun 2017 01:10:03 +0200 Message-ID: References: X-Original-To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 43 Organization: linux.* mail to news gateway X-Original-Cc: Paul Burton , Leonid Yegoshin , linux-mips@linux-mips.org, Ralf Baechle , Willy Tarreau X-Original-Date: Thu, 8 Jun 2017 00:58:51 +0200 X-Original-Message-ID: <1496876436-32402-146-git-send-email-w@1wt.eu> X-Original-References: <1496876436-32402-1-git-send-email-w@1wt.eu> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1660321 From: Paul Burton commit 67c75057709a6d85c681c78b9b2f9b71191f01a2 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 Fixes: 34c2f668d0f6 ("MIPS: microMIPS: Add unaligned access support.") Cc: Leonid Yegoshin Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14531/ Signed-off-by: Ralf Baechle Signed-off-by: Willy Tarreau --- arch/mips/kernel/process.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index e67e17a..427187b1 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -260,9 +260,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) -- 2.8.0.rc2.1.gbe9624a