Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b82c105 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn' 



Fix commit e50c0a8f ("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: e50c0a8f ("Support the MIPS32 / MIPS64 DSP ASE.")
Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org # 2.6.14+
Patchwork: https://patchwork.linux-mips.org/patch/16396/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 11a3799d

arch/mips/kernel/branch.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -399,7 +399,7 @@ int __MIPS16e_compute_return_epc(struct pt_regs *regs) 
 *

 *

 * @regs:	Pointer to pt_regs

 * @regs:	Pointer to pt_regs

 * @insn:	branch instruction to decode

 * @insn:	branch instruction to decode

 * @returns:	-EFAULT on error and forces SIGBUS, and on success

 * @returns:	-EFAULT on error and forces SIGILL, and on success

 *		returns 0 or BRANCH_LIKELY_TAKEN as appropriate after

 *		returns 0 or BRANCH_LIKELY_TAKEN as appropriate after

 *		evaluating the branch.

 *		evaluating the branch.

 *

 *
@@ -832,8 +832,9 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	return ret;

	return ret;





sigill_dsp:

sigill_dsp:

	printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm);

	pr_info("%s: DSP branch but not DSP ASE - sending SIGILL.\n",

	force_sig(SIGBUS, current);

		current->comm);

	force_sig(SIGILL, current);

	return -EFAULT;

	return -EFAULT;

sigill_r6:

sigill_r6:

	pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",

	pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",