diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 16:18:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 16:18:40 -0800 |
| commit | f036d9f3985a529a81e582f68aa984eb7b20d54d (patch) | |
| tree | eaf58cc5d2c81e3ca08e23b5cda76eacd515d166 /arch/sparc/kernel/signal_64.c | |
| parent | 6abce7711fcbd72b42f0c9632c1beccf4e674663 (diff) | |
| download | lwn-f036d9f3985a529a81e582f68aa984eb7b20d54d.tar.gz lwn-f036d9f3985a529a81e582f68aa984eb7b20d54d.zip | |
sparc: Align clone and signal stacks to 16 bytes.
This is mandatory for 64-bit processes, and doing it also for 32-bit
processes saves a conditional in the compat case.
This fixes the glibc/nptl/tst-stdio1 test case, as well
as many others, on 64-bit.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/signal_64.c')
| -rw-r--r-- | arch/sparc/kernel/signal_64.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c index 647afbda7ae1..9fa48c30037e 100644 --- a/arch/sparc/kernel/signal_64.c +++ b/arch/sparc/kernel/signal_64.c @@ -353,7 +353,7 @@ segv: /* Checks if the fp is valid */ static int invalid_frame_pointer(void __user *fp, int fplen) { - if (((unsigned long) fp) & 7) + if (((unsigned long) fp) & 15) return 1; return 0; } @@ -396,15 +396,17 @@ static inline void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs * sp = current->sas_ss_sp + current->sas_ss_size; } + sp -= framesize; + /* Always align the stack frame. This handles two cases. First, * sigaltstack need not be mindful of platform specific stack * alignment. Second, if we took this signal because the stack * is not aligned properly, we'd like to take the signal cleanly * and report that. */ - sp &= ~7UL; + sp &= ~15UL; - return (void __user *)(sp - framesize); + return (void __user *) sp; } static inline void |