diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-14 14:47:53 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-19 18:07:41 -0500 |
commit | 9026843952adac5b123c7b8dc961e5c15828d9e1 (patch) | |
tree | 4ef89cf05cf97427ceb2587fed94a6a12833d527 /arch/x86/kernel/signal.c | |
parent | 6bf9adfc90370b695cb111116e15fdc0e1906270 (diff) |
generic compat_sys_sigaltstack()
Again, conditional on CONFIG_GENERIC_SIGALTSTACK
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/kernel/signal.c')
-rw-r--r-- | arch/x86/kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 16d065c23baf..b17ed37c61a2 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -857,7 +857,6 @@ asmlinkage long sys32_x32_rt_sigreturn(struct pt_regs *regs) | |||
857 | struct rt_sigframe_x32 __user *frame; | 857 | struct rt_sigframe_x32 __user *frame; |
858 | sigset_t set; | 858 | sigset_t set; |
859 | unsigned long ax; | 859 | unsigned long ax; |
860 | struct pt_regs tregs; | ||
861 | 860 | ||
862 | frame = (struct rt_sigframe_x32 __user *)(regs->sp - 8); | 861 | frame = (struct rt_sigframe_x32 __user *)(regs->sp - 8); |
863 | 862 | ||
@@ -871,8 +870,7 @@ asmlinkage long sys32_x32_rt_sigreturn(struct pt_regs *regs) | |||
871 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax)) | 870 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax)) |
872 | goto badframe; | 871 | goto badframe; |
873 | 872 | ||
874 | tregs = *regs; | 873 | if (compat_restore_altstack(&frame->uc.uc_stack)) |
875 | if (sys32_sigaltstack(&frame->uc.uc_stack, NULL, &tregs) == -EFAULT) | ||
876 | goto badframe; | 874 | goto badframe; |
877 | 875 | ||
878 | return ax; | 876 | return ax; |