|
@@ -127,17 +127,11 @@ static int setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static inline void __user *get_sigframe(struct k_sigaction *ka,
|
|
|
+static inline void __user *get_sigframe(struct ksignal *ksig,
|
|
|
struct pt_regs *regs,
|
|
|
unsigned long framesize)
|
|
|
{
|
|
|
- unsigned long sp = regs->sp;
|
|
|
-
|
|
|
- /*
|
|
|
- * This is the X/Open sanctioned signal stack switching.
|
|
|
- */
|
|
|
- if ((ka->sa.sa_flags & SA_ONSTACK) && sas_ss_flags(sp) == 0)
|
|
|
- sp = current->sas_ss_sp + current->sas_ss_size;
|
|
|
+ unsigned long sp = sigsp(regs->sp, ksig);
|
|
|
|
|
|
/*
|
|
|
* No matter what happens, 'sp' must be dword
|
|
@@ -153,7 +147,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
|
|
|
unsigned long __user *retcode;
|
|
|
int err = 0;
|
|
|
|
|
|
- frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
|
|
|
+ frame = get_sigframe(ksig, regs, sizeof(*frame));
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
|
|
|
return -EFAULT;
|