lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Nov 2017 22:17:36 +0100 From: Willy Tarreau <w@....eu> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org, linux@...ck-us.net Cc: "Maciej W. Rozycki" <macro@...tec.com>, James Hogan <james.hogan@...tec.com>, linux-mips@...ux-mips.org, Ralf Baechle <ralf@...ux-mips.org>, Willy Tarreau <w@....eu> Subject: [PATCH 3.10 036/139] MIPS: Actually decode JALX in `__compute_return_epc_for_insn' From: "Maciej W. Rozycki" <macro@...tec.com> commit a9db101b735a9d49295326ae41f610f6da62b08c upstream. Complement commit fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.") and actually decode the regular MIPS JALX major instruction opcode, the handling of which has been added with the said commit for EPC calculation in `__compute_return_epc_for_insn'. Fixes: fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.") Signed-off-by: Maciej W. Rozycki <macro@...tec.com> Cc: James Hogan <james.hogan@...tec.com> Cc: linux-mips@...ux-mips.org Cc: stable@...r.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16394/ Signed-off-by: Ralf Baechle <ralf@...ux-mips.org> Signed-off-by: Willy Tarreau <w@....eu> --- arch/mips/kernel/branch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 9250996..63b942f 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -297,6 +297,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, /* * These are unconditional and in j_format. */ + case jalx_op: case jal_op: regs->regs[31] = regs->cp0_epc + 8; case j_op: -- 2.8.0.rc2.1.gbe9624a
Powered by blists - more mailing lists