1 files changed, 15 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 8fdeca2d459..d73b25e22fc 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -419,9 +419,7 @@ static long restore_user_regs(struct pt_regs *regs,
 {
         long err;
         unsigned int save_r2 = 0;
-#if defined(CONFIG_ALTIVEC) || defined(CONFIG_SPE)
         unsigned long msr;
-#endif
 
         /*
          * restore general registers but not including MSR or SOFTE. Also
@@ -430,11 +428,16 @@ static long restore_user_regs(struct pt_regs *regs,
         if (!sig)
                 save_r2 = (unsigned int)regs->gpr[2];
         err = restore_general_regs(regs, sr);
+        err |= __get_user(msr, &sr->mc_gregs[PT_MSR]);
         if (!sig)
                 regs->gpr[2] = (unsigned long) save_r2;
         if (err)
                 return 1;
 
+        /* if doing signal return, restore the previous little-endian mode */
+        if (sig)
+                regs->msr = (regs->msr & ~MSR_LE) | (msr & MSR_LE);
+
         /*
          * Do this before updating the thread state in
          * current->thread.fpr/vr/evr.  That way, if we get preempted
@@ -455,7 +458,7 @@ static long restore_user_regs(struct pt_regs *regs,
         /* force the process to reload the altivec registers from
            current->thread when it next does altivec instructions */
         regs->msr &= ~MSR_VEC;
-        if (!__get_user(msr, &sr->mc_gregs[PT_MSR]) && (msr & MSR_VEC) != 0) {
+        if (msr & MSR_VEC) {
                 /* restore altivec registers from the stack */
                 if (__copy_from_user(current->thread.vr, &sr->mc_vregs,
                                      sizeof(sr->mc_vregs)))
@@ -472,7 +475,7 @@ static long restore_user_regs(struct pt_regs *regs,
         /* force the process to reload the spe registers from
            current->thread when it next does spe instructions */
         regs->msr &= ~MSR_SPE;
-        if (!__get_user(msr, &sr->mc_gregs[PT_MSR]) && (msr & MSR_SPE) != 0) {
+        if (msr & MSR_SPE) {
                 /* restore spe registers from the stack */
                 if (__copy_from_user(current->thread.evr, &sr->mc_vregs,
                                      ELF_NEVRREG * sizeof(u32)))
@@ -757,10 +760,10 @@ static int handle_rt_signal(unsigned long sig, struct k_sigaction *ka,
 
         /* Save user registers on the stack */
         frame = &rt_sf->uc.uc_mcontext;
-        if (vdso32_rt_sigtramp && current->thread.vdso_base) {
+        if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
                 if (save_user_regs(regs, frame, 0))
                         goto badframe;
-                regs->link = current->thread.vdso_base + vdso32_rt_sigtramp;
+                regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
         } else {
                 if (save_user_regs(regs, frame, __NR_rt_sigreturn))
                         goto badframe;
@@ -777,6 +780,8 @@ static int handle_rt_signal(unsigned long sig, struct k_sigaction *ka,
         regs->gpr[5] = (unsigned long) &rt_sf->uc;
         regs->gpr[6] = (unsigned long) rt_sf;
         regs->nip = (unsigned long) ka->sa.sa_handler;
+        /* enter the signal handler in big-endian mode */
+        regs->msr &= ~MSR_LE;
         regs->trap = 0;
         return 1;
 
@@ -1038,10 +1043,10 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,
             || __put_user(sig, &sc->signal))
                 goto badframe;
 
-        if (vdso32_sigtramp && current->thread.vdso_base) {
+        if (vdso32_sigtramp && current->mm->context.vdso_base) {
                 if (save_user_regs(regs, &frame->mctx, 0))
                         goto badframe;
-                regs->link = current->thread.vdso_base + vdso32_sigtramp;
+                regs->link = current->mm->context.vdso_base + vdso32_sigtramp;
         } else {
                 if (save_user_regs(regs, &frame->mctx, __NR_sigreturn))
                         goto badframe;
@@ -1056,6 +1061,8 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,
         regs->gpr[3] = sig;
         regs->gpr[4] = (unsigned long) sc;
         regs->nip = (unsigned long) ka->sa.sa_handler;
+        /* enter the signal handler in big-endian mode */
+        regs->msr &= ~MSR_LE;
         regs->trap = 0;
 
         return 1;