This is a note to let you know that I've just added the patch titled MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller to the 3.17-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-lib-memcpy-restore-nop-on-delay-slot-before-returning-to-caller.patch and it can be found in the queue-3.17 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 51b1029d9966060c6ad02030e6f251425b4f06c1 Mon Sep 17 00:00:00 2001 From: Markos Chandras <markos.chandras@xxxxxxxxxx> Date: Mon, 17 Nov 2014 09:32:38 +0000 Subject: MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller From: Markos Chandras <markos.chandras@xxxxxxxxxx> commit 51b1029d9966060c6ad02030e6f251425b4f06c1 upstream. Commit cf62a8b8134dd3 ("MIPS: lib: memcpy: Use macro to build the copy_user code") switched to a macro in order to build the memcpy symbols in preparation for the EVA support. However, this commit also removed the NOP instruction after the 'jr ra' when returning back to the caller. This had no visible side-effects since the next instruction was a load to the t0 register which was already in the clobbered list, but it may have undesired effects in the future if some other code is introduced in between the .Ldone and the .Ll_exc_copy labels. Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx Patchwork: https://patchwork.linux-mips.org/patch/8512/ Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/mips/lib/memcpy.S | 1 + 1 file changed, 1 insertion(+) --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S @@ -503,6 +503,7 @@ STOREB(t0, NBYTES-2(dst), .Ls_exc_p1\@) .Ldone\@: jr ra + nop .if __memcpy == 1 END(memcpy) .set __memcpy, 0 Patches currently in stable-queue which might be from markos.chandras@xxxxxxxxxx are queue-3.17/mips-asm-uaccess-add-v1-register-to-clobber-list-on-eva.patch queue-3.17/mips-cpu-probe-set-the-ftlb-probability-bit-on-supported-cores.patch queue-3.17/mips-lib-memcpy-restore-nop-on-delay-slot-before-returning-to-caller.patch queue-3.17/mips-tlbex-fix-potential-htw-race-on-tlbl-m-s-handlers.patch queue-3.17/mips-tlb-r4k-add-missing-htw-stop-start-sequences.patch queue-3.17/mips-r4kcache-add-eva-case-for-protected_writeback_dcache_line.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html