[PATCH] m68knommu: fix a5 reg corruption in signal handlers

This is a patch adapted from a posting by Andrea Tarani which was
pointed out to me by Bernardo Innocenti.  Thanks to both of them for
their help and patience.

The original posting is here:
  http://mailman.uclinux.org/pipermail/uclinux-dev/2005-July/033543.html

The problem first manifest itself as busybox ping terminating with an
"Illegal instruction".  I reduced this to a test case and found that
variable size arrays allocated on the stack could lead to stacks not
aligned on 32 bit boundaries.  For the Coldfire this proved fatal.

Having been pointed out this patch by Bernardo, I applied it and it
fixed the first test case.  I then went back to busybox's ping.  This
still failed with "Illegal instruction", but in a different way.  Before
it depended on the size allocated for the ping buffer, now it happened
every time.  I also found it depended on optimisation level (gcc-3.4.0)
-Os was okay but not -O2.

After a lot of looking, it turned out that register a5 was being
corrupted by the signal handler (after applying the patch).  I re-worked
the patch a bit to save/restore a5 and now all seems well.

Patch submitted by Stuart Hughs <stuarth@freescale.com>

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index 43a2726c0d0a4931070a55c1af124650ed872e58..e1b3aa39e2708f8d0dd1b1200591c2a918790548 100644 (file)
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -285,6 +285,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp,
        regs->d1 = context.sc_d1;
        regs->a0 = context.sc_a0;
        regs->a1 = context.sc_a1;
+       ((struct switch_stack *)regs - 1)->a5 = context.sc_a5;
        regs->sr = (regs->sr & 0xff00) | (context.sc_sr & 0xff);
        regs->pc = context.sc_pc;
        regs->orig_d0 = -1;             /* disable syscall checks */
@@ -498,6 +499,7 @@ static void setup_sigcontext(struct sigcontext *sc, struct pt_regs *regs,
        sc->sc_d1 = regs->d1;
        sc->sc_a0 = regs->a0;
        sc->sc_a1 = regs->a1;
+       sc->sc_a5 = ((struct switch_stack *)regs - 1)->a5;
        sc->sc_sr = regs->sr;
        sc->sc_pc = regs->pc;
        sc->sc_formatvec = regs->format << 12 | regs->vector;
@@ -597,6 +599,9 @@ static void setup_frame (int sig, struct k_sigaction *ka,
        /* Set up registers for signal handler */
        wrusp ((unsigned long) frame);
        regs->pc = (unsigned long) ka->sa.sa_handler;
+       ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data;
+       regs->format = 0x4; /*set format byte to make stack appear modulo 4 
+                                               which it will be when doing the rte */
 
 adjust_stack:
        /* Prepare to skip over the extra stuff in the exception frame.  */
@@ -664,6 +669,9 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
        /* Set up registers for signal handler */
        wrusp ((unsigned long) frame);
        regs->pc = (unsigned long) ka->sa.sa_handler;
+       ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data;
+       regs->format = 0x4; /*set format byte to make stack appear modulo 4 
+                                               which it will be when doing the rte */
 
 adjust_stack:
        /* Prepare to skip over the extra stuff in the exception frame.  */