xtensa: Use get_signal() signal_setup_done()
Use the more generic functions get_signal() signal_setup_done() for signal delivery. Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
649671c90e
commit
5bdb7611eb
|
@ -331,17 +331,17 @@ gen_return_code(unsigned char *codemem)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
static int setup_frame(struct ksignal *ksig, sigset_t *set,
|
||||||
sigset_t *set, struct pt_regs *regs)
|
struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
struct rt_sigframe *frame;
|
struct rt_sigframe *frame;
|
||||||
int err = 0;
|
int err = 0, sig = ksig->sig;
|
||||||
int signal;
|
int signal;
|
||||||
unsigned long sp, ra, tp;
|
unsigned long sp, ra, tp;
|
||||||
|
|
||||||
sp = regs->areg[1];
|
sp = regs->areg[1];
|
||||||
|
|
||||||
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
|
if ((ksig->ka.sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
|
||||||
sp = current->sas_ss_sp + current->sas_ss_size;
|
sp = current->sas_ss_sp + current->sas_ss_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -351,7 +351,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
||||||
panic ("Double exception sys_sigreturn\n");
|
panic ("Double exception sys_sigreturn\n");
|
||||||
|
|
||||||
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) {
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) {
|
||||||
goto give_sigsegv;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
signal = current_thread_info()->exec_domain
|
signal = current_thread_info()->exec_domain
|
||||||
|
@ -360,8 +360,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
||||||
? current_thread_info()->exec_domain->signal_invmap[sig]
|
? current_thread_info()->exec_domain->signal_invmap[sig]
|
||||||
: sig;
|
: sig;
|
||||||
|
|
||||||
if (ka->sa.sa_flags & SA_SIGINFO) {
|
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
|
||||||
err |= copy_siginfo_to_user(&frame->info, info);
|
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create the user context. */
|
/* Create the user context. */
|
||||||
|
@ -372,8 +372,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
||||||
err |= setup_sigcontext(frame, regs);
|
err |= setup_sigcontext(frame, regs);
|
||||||
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
|
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
|
||||||
|
|
||||||
if (ka->sa.sa_flags & SA_RESTORER) {
|
if (ksig->ka.sa.sa_flags & SA_RESTORER) {
|
||||||
ra = (unsigned long)ka->sa.sa_restorer;
|
ra = (unsigned long)ksig->ka.sa.sa_restorer;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/* Create sys_rt_sigreturn syscall in stack frame */
|
/* Create sys_rt_sigreturn syscall in stack frame */
|
||||||
|
@ -381,7 +381,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
||||||
err |= gen_return_code(frame->retcode);
|
err |= gen_return_code(frame->retcode);
|
||||||
|
|
||||||
if (err) {
|
if (err) {
|
||||||
goto give_sigsegv;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
ra = (unsigned long) frame->retcode;
|
ra = (unsigned long) frame->retcode;
|
||||||
}
|
}
|
||||||
|
@ -393,7 +393,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
||||||
|
|
||||||
/* Set up registers for signal handler; preserve the threadptr */
|
/* Set up registers for signal handler; preserve the threadptr */
|
||||||
tp = regs->threadptr;
|
tp = regs->threadptr;
|
||||||
start_thread(regs, (unsigned long) ka->sa.sa_handler,
|
start_thread(regs, (unsigned long) ksig->ka.sa.sa_handler,
|
||||||
(unsigned long) frame);
|
(unsigned long) frame);
|
||||||
|
|
||||||
/* Set up a stack frame for a call4
|
/* Set up a stack frame for a call4
|
||||||
|
@ -416,10 +416,6 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
give_sigsegv:
|
|
||||||
force_sigsegv(sig, current);
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -433,15 +429,11 @@ give_sigsegv:
|
||||||
*/
|
*/
|
||||||
static void do_signal(struct pt_regs *regs)
|
static void do_signal(struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
siginfo_t info;
|
struct ksignal ksig;
|
||||||
int signr;
|
|
||||||
struct k_sigaction ka;
|
|
||||||
|
|
||||||
task_pt_regs(current)->icountlevel = 0;
|
task_pt_regs(current)->icountlevel = 0;
|
||||||
|
|
||||||
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
if (get_signal(&ksig)) {
|
||||||
|
|
||||||
if (signr > 0) {
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* Are we from a system call? */
|
/* Are we from a system call? */
|
||||||
|
@ -457,7 +449,7 @@ static void do_signal(struct pt_regs *regs)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case -ERESTARTSYS:
|
case -ERESTARTSYS:
|
||||||
if (!(ka.sa.sa_flags & SA_RESTART)) {
|
if (!(ksig.ka.sa.sa_flags & SA_RESTART)) {
|
||||||
regs->areg[2] = -EINTR;
|
regs->areg[2] = -EINTR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -476,11 +468,8 @@ static void do_signal(struct pt_regs *regs)
|
||||||
|
|
||||||
/* Whee! Actually deliver the signal. */
|
/* Whee! Actually deliver the signal. */
|
||||||
/* Set up the stack frame */
|
/* Set up the stack frame */
|
||||||
ret = setup_frame(signr, &ka, &info, sigmask_to_save(), regs);
|
ret = setup_frame(&ksig, sigmask_to_save(), regs);
|
||||||
if (ret)
|
signal_setup_done(ret, &ksig, 0);
|
||||||
return;
|
|
||||||
|
|
||||||
signal_delivered(signr, &info, &ka, regs, 0);
|
|
||||||
if (current->ptrace & PT_SINGLESTEP)
|
if (current->ptrace & PT_SINGLESTEP)
|
||||||
task_pt_regs(current)->icountlevel = 1;
|
task_pt_regs(current)->icountlevel = 1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue