1 files changed, 7 insertions, 2 deletions

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 296786bdbb73..1c16c35c271a 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -392,14 +392,19 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
                 if (ksig->ka.sa.sa_flags & SA_SIGINFO)
                         idx += 3;
 
+                /*
+                 * Put the sigreturn code on the stack no matter which return
+                 * mechanism we use in order to remain ABI compliant
+                 */
                 if (__put_user(sigreturn_codes[idx],   rc) ||
                     __put_user(sigreturn_codes[idx+1], rc+1))
                         return 1;
 
-                if (cpsr & MODE32_BIT) {
+                if ((cpsr & MODE32_BIT) && !IS_ENABLED(CONFIG_ARM_MPU)) {
                         /*
                          * 32-bit code can use the new high-page
-                         * signal return code support.
+                         * signal return code support except when the MPU has
+                         * protected the vectors page from PL0
                          */
                         retcode = KERN_SIGRETURN_CODE + (idx << 2) + thumb;
                 } else {