|
@@ -123,8 +123,7 @@ asmlinkage int __sys_rt_sigreturn(struct pt_regs *regs)
|
|
|
if (restore_sigframe(regs, &frame->sig))
|
|
|
goto badframe;
|
|
|
|
|
|
- if (do_sigaltstack(&frame->sig.uc.uc_stack, NULL, regs->UCreg_sp)
|
|
|
- == -EFAULT)
|
|
|
+ if (restore_altstack(&frame->sig.uc.uc_stack))
|
|
|
goto badframe;
|
|
|
|
|
|
return regs->UCreg_00;
|
|
@@ -265,7 +264,6 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
|
|
|
{
|
|
|
struct rt_sigframe __user *frame =
|
|
|
get_sigframe(ka, regs, sizeof(*frame));
|
|
|
- stack_t stack;
|
|
|
int err = 0;
|
|
|
|
|
|
if (!frame)
|
|
@@ -275,13 +273,7 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
|
|
|
|
|
|
err |= __put_user(0, &frame->sig.uc.uc_flags);
|
|
|
err |= __put_user(NULL, &frame->sig.uc.uc_link);
|
|
|
-
|
|
|
- memset(&stack, 0, sizeof(stack));
|
|
|
- stack.ss_sp = (void __user *)current->sas_ss_sp;
|
|
|
- stack.ss_flags = sas_ss_flags(regs->UCreg_sp);
|
|
|
- stack.ss_size = current->sas_ss_size;
|
|
|
- err |= __copy_to_user(&frame->sig.uc.uc_stack, &stack, sizeof(stack));
|
|
|
-
|
|
|
+ err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
|
|
|
err |= setup_sigframe(&frame->sig, regs, set);
|
|
|
if (err == 0)
|
|
|
err |= setup_return(regs, ka, frame->sig.retcode, frame, usig);
|