FAILED: patch "[PATCH] MIPS: uaccess: Add micromips clobbers to bzero invocation" failed to apply to 3.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 3.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
b3d7e55c3f886493235bfee08e1e5a4a27cbcce8Mon Sep 17 00:00:00 2001
From: Matt Redfearn <[email protected]>
Date: Tue, 17 Apr 2018 16:40:01 +0100
Subject: [PATCH] MIPS: uaccess: Add micromips clobbers to bzero invocation
The micromips implementation of bzero additionally clobbers registers t7 & t8. Specify this in the clobbers list when invoking bzero.
Fixes 26c5e07d1478 ("MIPS: microMIPS: Optimise 'memset' core library function.")
Reported-by James Hogan <[email protected]>
Signed-off-by Matt Redfearn <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc <[email protected]> # 3.10+
Patchwork: https://patchwork.linux-mips.org/patch/19110/
Signed-off-by James Hogan <[email protected]>
arch/mips/include/asm/uaccess.h +9 -2
@@ -654,6 +654,13 @@ __clear_user(void __user *addr, __kernel_size_t size) {__kernel_size_t res; +#ifdef CONFIG_CPU_MICROMIPS +/* micromips memset / bzero also clobbers t7 & t8 */ +#define bzero_clobbers "$4", "$5", "$6", __UA_t0, __UA_t1, "$15", "$24", "$31" +#else +#define bzero_clobbers "$4", "$5", "$6", __UA_t0, __UA_t1, "$31" +#endif /* CONFIG_CPU_MICROMIPS */ +if (eva_kernel_access ()) { __asm__ __volatile__( "move\t$4, %1\n\t"
@@ -663,7 +670,7 @@ __clear_user(void __user *addr, __kernel_size_t size) "move\t%0, $6" : "=r" (res) : "r" (addr), "r" (size) - : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31"); + : bzero_clobbers); }else {might_fault (); __asm__ __volatile__(
@@ -674,7 +681,7 @@ __clear_user(void __user *addr, __kernel_size_t size) "move\t%0, $6" : "=r" (res) : "r" (addr), "r" (size) - : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31"); + : bzero_clobbers); }return res;