Skip to content

Commit e5bf16f

Browse files
Maciej W. Rozyckigregkh
authored andcommitted
MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn'
commit 7b82c1058ac1f8f8b9f2b8786b1f710a57a870a8 upstream. Fix commit e50c0a8 ("Support the MIPS32 / MIPS64 DSP ASE.") and send SIGILL rather than SIGBUS whenever an unimplemented BPOSGE32 DSP ASE instruction has been encountered in `__compute_return_epc_for_insn' as our Reserved Instruction exception handler would in response to an attempt to actually execute the instruction. Sending SIGBUS only makes sense for the unaligned PC case, since moved to `__compute_return_epc'. Adjust function documentation accordingly, correct formatting and use `pr_info' rather than `printk' as the other exit path already does. Fixes: e50c0a8 ("Support the MIPS32 / MIPS64 DSP ASE.") Signed-off-by: Maciej W. Rozycki <macro@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16396/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4c7d28c commit e5bf16f

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

arch/mips/kernel/branch.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ int __MIPS16e_compute_return_epc(struct pt_regs *regs)
399399
*
400400
* @regs: Pointer to pt_regs
401401
* @insn: branch instruction to decode
402-
* @returns: -EFAULT on error and forces SIGBUS, and on success
402+
* @returns: -EFAULT on error and forces SIGILL, and on success
403403
* returns 0 or BRANCH_LIKELY_TAKEN as appropriate after
404404
* evaluating the branch.
405405
*
@@ -844,8 +844,9 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
844844
return ret;
845845

846846
sigill_dsp:
847-
printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm);
848-
force_sig(SIGBUS, current);
847+
pr_info("%s: DSP branch but not DSP ASE - sending SIGILL.\n",
848+
current->comm);
849+
force_sig(SIGILL, current);
849850
return -EFAULT;
850851
sigill_r6:
851852
pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",

0 commit comments

Comments
 (0)