]> git.itanic.dy.fi Git - linux-stable/commit
MIPS: Fix kernel crash for R6 in jump label branch function
authorArcher Yan <ayan@wavecomp.com>
Fri, 8 Mar 2019 03:29:19 +0000 (03:29 +0000)
committerPaul Burton <paul.burton@mips.com>
Mon, 11 Mar 2019 18:11:11 +0000 (11:11 -0700)
commit47c25036b60f27b86ab44b66a8861bcf81cde39b
treea8f62bb0230208c170bfc3bad53506aa82a266e6
parent3f0a53bc6482fb09770982a8447981260ea258dc
MIPS: Fix kernel crash for R6 in jump label branch function

Insert Branch instruction instead of NOP to make sure assembler don't
patch code in forbidden slot. In jump label function, it might
be possible to patch Control Transfer Instructions(CTIs) into
forbidden slot, which will generate Reserved Instruction exception
in MIPS release 6.

Signed-off-by: Archer Yan <ayan@wavecomp.com>
Reviewed-by: Paul Burton <paul.burton@mips.com>
[paul.burton@mips.com:
  - Add MIPS prefix to subject.
  - Mark for stable from v4.0, which introduced r6 support, onwards.]
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: stable@vger.kernel.org # v4.0+
arch/mips/include/asm/jump_label.h