提交 8e2beafa 编写于 作者: R Richard Weinberger 提交者: Richard Weinberger

openrisc: Use sigsp()

Use sigsp() instead of the open coded variant.
Signed-off-by: NRichard Weinberger <richard@nod.at>
上级 a8040ff8
...@@ -132,30 +132,16 @@ static inline unsigned long align_sigframe(unsigned long sp) ...@@ -132,30 +132,16 @@ static inline unsigned long align_sigframe(unsigned long sp)
* or the alternate stack. * or the alternate stack.
*/ */
static inline void __user *get_sigframe(struct k_sigaction *ka, static inline void __user *get_sigframe(struct ksignal *ksig,
struct pt_regs *regs, size_t frame_size) struct pt_regs *regs, size_t frame_size)
{ {
unsigned long sp = regs->sp; unsigned long sp = regs->sp;
int onsigstack = on_sig_stack(sp);
/* redzone */ /* redzone */
sp -= STACK_FRAME_OVERHEAD; sp -= STACK_FRAME_OVERHEAD;
sp = sigsp(sp, ksig);
/* This is the X/Open sanctioned signal stack switching. */
if ((ka->sa.sa_flags & SA_ONSTACK) && !onsigstack) {
if (current->sas_ss_size)
sp = current->sas_ss_sp + current->sas_ss_size;
}
sp = align_sigframe(sp - frame_size); sp = align_sigframe(sp - frame_size);
/*
* If we are on the alternate signal stack and would overflow it, don't.
* Return an always-bogus address instead so we will die with SIGSEGV.
*/
if (onsigstack && !likely(on_sig_stack(sp)))
return (void __user *)-1L;
return (void __user *)sp; return (void __user *)sp;
} }
...@@ -173,7 +159,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, ...@@ -173,7 +159,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
unsigned long return_ip; unsigned long return_ip;
int err = 0; 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))) if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册