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/signal32.c | |
parent | 6abce7711fcbd72b42f0c9632c1beccf4e674663 (diff) | |
download | kernel_samsung_crespo-f036d9f3985a529a81e582f68aa984eb7b20d54d.zip kernel_samsung_crespo-f036d9f3985a529a81e582f68aa984eb7b20d54d.tar.gz kernel_samsung_crespo-f036d9f3985a529a81e582f68aa984eb7b20d54d.tar.bz2 |
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/signal32.c')
-rw-r--r-- | arch/sparc/kernel/signal32.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c index ba5b09a..ea22cd3 100644 --- a/arch/sparc/kernel/signal32.c +++ b/arch/sparc/kernel/signal32.c @@ -120,8 +120,8 @@ struct rt_signal_frame32 { }; /* Align macros */ -#define SF_ALIGNEDSZ (((sizeof(struct signal_frame32) + 7) & (~7))) -#define RT_ALIGNEDSZ (((sizeof(struct rt_signal_frame32) + 7) & (~7))) +#define SF_ALIGNEDSZ (((sizeof(struct signal_frame32) + 15) & (~15))) +#define RT_ALIGNEDSZ (((sizeof(struct rt_signal_frame32) + 15) & (~15))) int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) { @@ -420,15 +420,17 @@ static void __user *get_sigframe(struct sigaction *sa, struct pt_regs *regs, uns 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 int save_fpu_state32(struct pt_regs *regs, __siginfo_fpu_t __user *fpu) |