diff options
author | Maciej W. Rozycki <macro@imgtec.com> | 2017-06-16 01:07:34 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-06-29 02:42:26 +0200 |
commit | 11a3799dbeb620bf0400b1fda5cc2c6bea55f20a (patch) | |
tree | e04e3cf3a4a30b7f8bcab14a555bfc8fdfa9d7a8 /arch/mips/kernel/branch.c | |
parent | MIPS: Actually decode JALX in `__compute_return_epc_for_insn' (diff) | |
download | linux-11a3799dbeb620bf0400b1fda5cc2c6bea55f20a.tar.xz linux-11a3799dbeb620bf0400b1fda5cc2c6bea55f20a.zip |
MIPS: Fix unaligned PC interpretation in `compute_return_epc'
Fix a regression introduced with commit fb6883e5809c ("MIPS: microMIPS:
Support handling of delay slots.") and defer to `__compute_return_epc'
if the ISA bit is set in EPC with non-MIPS16, non-microMIPS hardware,
which will then arrange for a SIGBUS due to an unaligned instruction
reference. Returning EPC here is never correct as the API defines this
function's result to be either a negative error code on failure or one
of 0 and BRANCH_LIKELY_TAKEN on success.
Fixes: fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.")
Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org # 3.9+
Patchwork: https://patchwork.linux-mips.org/patch/16395/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/branch.c')
0 files changed, 0 insertions, 0 deletions