Patch "metag/usercopy: Add missing fixups" has been added to the 4.9-stable tree
This is a note to let you know that I've just added the patch titled
metag/usercopy: Add missing fixups
to the 4.9-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:
metag-usercopy-add-missing-fixups.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
b884a190afcecdbef34ca508ea5ee88bb7c77861Mon Sep 17 00:00:00 2001
From: James Hogan <[email protected]>
Date: Tue, 4 Apr 2017 08:51:34 +0100
Subject: metag/usercopy: Add missing fixups
From: James Hogan <[email protected]>
commit b884a190afcecdbef34ca508ea5ee88bb7c77861 upstream.
The rapf copy loops in the Meta usercopy code is missing some extable entries for HTP cores with unaligned access checking enabled, where faults occur on the instruction immediately after the faulting access.
Add the fixup labels and extable entries for these cases so that corner case user copy failures don't cause kernel crashes.
--- arch/metag/lib/usercopy.c | 72 ++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 24 deletions(-)
arch/metag/lib/usercopy.c +48 -24
@@ -259,27 +259,31 @@"MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \"22:\n" \"MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ -"SUB %3, %3, #32\n" \"23:\n" \ -"MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ +"SUB %3, %3, #32\n" \"24:\n" \ +"MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ +"25:\n" \"MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"26:\n" \"SUB %3, %3, #32\n" \"DCACHE [%1+#-64], D0Ar6\n" \"BR $Lloop" id"\n" \ \"MOV RAPF, %1\n" \ -"25:\n" \ +"27:\n" \"MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"26:\n" \ +"28:\n" \"MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"29:\n" \"SUB %3, %3, #32\n" \ -"27:\n" \ +"30:\n" \"MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"28:\n" \ +"31:\n" \"MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"32:\n" \"SUB %0, %0, #8\n" \ -"29:\n" \ +"33:\n" \"SETL [%0++], D0.7, D1.7\n" \"SUB %3, %3, #32\n" \"1:" \
@@ -311,7 +315,11 @@ " .long 26b,3b\n" \ " .long 27b,3b\n" \ " .long 28b,3b\n" \ - " .long 29b,4b\n" \ + " .long 29b,3b\n" \ + " .long 30b,3b\n" \ + " .long 31b,3b\n" \ + " .long 32b,3b\n" \ + " .long 33b,4b\n" \ " .previous\n" \ : "=r" (to), "=r" (from), "=r" (ret), "=d" (n) \ : "0" (to), "1" (from), "2" (ret), "3" (n) \
@@ -402,47 +410,55 @@"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \"22:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ -"SUB %3, %3, #16\n" \"23:\n" \ -"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"24:\n" \ -"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \"SUB %3, %3, #16\n" \ -"25:\n" \ +"24:\n" \"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"26:\n" \ +"25:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"26:\n" \"SUB %3, %3, #16\n" \"27:\n" \"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \"28:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"29:\n" \ +"SUB %3, %3, #16\n" \ +"30:\n" \ +"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ +"31:\n" \ +"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"32:\n" \"SUB %3, %3, #16\n" \"DCACHE [%1+#-64], D0Ar6\n" \"BR $Lloop" id"\n" \ \"MOV RAPF, %1\n" \ -"29:\n" \ +"33:\n" \"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"30:\n" \ +"34:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"35:\n" \"SUB %3, %3, #16\n" \ -"31:\n" \ +"36:\n" \"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"32:\n" \ +"37:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"38:\n" \"SUB %3, %3, #16\n" \ -"33:\n" \ +"39:\n" \"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"34:\n" \ +"40:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"41:\n" \"SUB %3, %3, #16\n" \ -"35:\n" \ +"42:\n" \"MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ -"36:\n" \ +"43:\n" \"MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ +"44:\n" \"SUB %0, %0, #4\n" \ -"37:\n" \ +"45:\n" \"SETD [%0++], D0.7\n" \"SUB %3, %3, #16\n" \"1:" \
@@ -482,7 +498,15 @@ " .long 34b,3b\n" \ " .long 35b,3b\n" \ " .long 36b,3b\n" \ - " .long 37b,4b\n" \ + " .long 37b,3b\n" \ + " .long 38b,3b\n" \ + " .long 39b,3b\n" \ + " .long 40b,3b\n" \ + " .long 41b,3b\n" \ + " .long 42b,3b\n" \ + " .long 43b,3b\n" \ + " .long 44b,3b\n" \ + " .long 45b,4b\n" \ " .previous\n" \ : "=r" (to), "=r" (from), "=r" (ret), "=d" (n) \ : "0" (to), "1" (from), "2" (ret), "3" (n) \
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/mips-end-spinlocks-with-.insn.patch queue-4.9/metag-usercopy-add-missing-fixups.patch queue-4.9/metag-usercopy-add-early-abort-to-copy_to_user.patch queue-4.9/mips-ralink-fix-typos-in-rt3883-pinctrl.patch queue-4.9/metag-usercopy-set-flags-before-addz.patch queue-4.9/metag-usercopy-fix-src-fixup-in-from-user-rapf-loops.patch queue-4.9/metag-usercopy-drop-unused-macros.patch queue-4.9/mips-lantiq-fix-missing-xbar-kernel-panic.patch queue-4.9/metag-usercopy-zero-rest-of-buffer-from-copy_from_user.patch queue-4.9/metag-usercopy-fix-alignment-error-checking.patch queue-4.9/mips-force-o32-fp64-support-on-32bit-mips64r6-kernels.patch