Skip to content

L
linux
Commit 81d103bf authored by Richard Weinberger's avatar Richard Weinberger Committed by Richard Weinberger
Browse files
Options

mips: Use get_signal() signal_setup_done() 

Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 9c53c7ec
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 84 deletions
arch/mips/include/asm/abi.h
View file @ 81d103bf
...@@ -13,13 +13,11 @@ ...@@ -13,13 +13,11 @@
#include <asm/siginfo.h> #include <asm/siginfo.h>
struct mips_abi { struct mips_abi {
int (* const setup_frame)(void *sig_return, struct k_sigaction *ka, int (* const setup_frame)(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, struct pt_regs *regs, sigset_t *set);
sigset_t *set);
const unsigned long signal_return_offset; const unsigned long signal_return_offset;
int (* const setup_rt_frame)(void *sig_return, struct k_sigaction *ka, int (* const setup_rt_frame)(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, struct pt_regs *regs, sigset_t *set);
sigset_t *set, siginfo_t *info);
const unsigned long rt_signal_return_offset; const unsigned long rt_signal_return_offset;
const unsigned long restart; const unsigned long restart;
}; };
......
arch/mips/kernel/signal-common.h
View file @ 81d103bf
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/* /*
* Determine which stack to use.. * Determine which stack to use..
*/ */
extern void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, extern void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
size_t frame_size); size_t frame_size);
/* Check and clear pending FPU exceptions in saved CSR */ /* Check and clear pending FPU exceptions in saved CSR */
extern int fpcsr_pending(unsigned int __user *fpcsr); extern int fpcsr_pending(unsigned int __user *fpcsr);
......
arch/mips/kernel/signal.c
View file @ 81d103bf
...@@ -428,20 +428,20 @@ asmlinkage void sys_rt_sigreturn(nabi_no_regargs struct pt_regs regs) ...@@ -428,20 +428,20 @@ asmlinkage void sys_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
} }
#ifdef CONFIG_TRAD_SIGNALS #ifdef CONFIG_TRAD_SIGNALS
static int setup_frame(void *sig_return, struct k_sigaction *ka, static int setup_frame(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, sigset_t *set) struct pt_regs *regs, sigset_t *set)
{ {
struct sigframe __user *frame; struct sigframe __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
goto give_sigsegv; return -EFAULT;
err |= setup_sigcontext(regs, &frame->sf_sc); err |= setup_sigcontext(regs, &frame->sf_sc);
err |= __copy_to_user(&frame->sf_mask, set, sizeof(*set)); err |= __copy_to_user(&frame->sf_mask, set, sizeof(*set));
if (err) if (err)
goto give_sigsegv; return -EFAULT;
/* /*
* Arguments to signal handler: * Arguments to signal handler:
...@@ -453,37 +453,32 @@ static int setup_frame(void *sig_return, struct k_sigaction *ka, ...@@ -453,37 +453,32 @@ static int setup_frame(void *sig_return, struct k_sigaction *ka,
* $25 and c0_epc point to the signal handler, $29 points to the * $25 and c0_epc point to the signal handler, $29 points to the
* struct sigframe. * struct sigframe.
*/ */
regs->regs[ 4] = signr; regs->regs[ 4] = ksig->sig;
regs->regs[ 5] = 0; regs->regs[ 5] = 0;
regs->regs[ 6] = (unsigned long) &frame->sf_sc; regs->regs[ 6] = (unsigned long) &frame->sf_sc;
regs->regs[29] = (unsigned long) frame; regs->regs[29] = (unsigned long) frame;
regs->regs[31] = (unsigned long) sig_return; regs->regs[31] = (unsigned long) sig_return;
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n", DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]); frame, regs->cp0_epc, regs->regs[31]);
return 0; return 0;
give_sigsegv:
force_sigsegv(signr, current);
return -EFAULT;
} }
#endif #endif
static int setup_rt_frame(void *sig_return, struct k_sigaction *ka, static int setup_rt_frame(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, sigset_t *set, struct pt_regs *regs, sigset_t *set)
siginfo_t *info)
{ {
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
goto give_sigsegv; return -EFAULT;
/* Create siginfo. */ /* Create siginfo. */
err |= copy_siginfo_to_user(&frame->rs_info, info); err |= copy_siginfo_to_user(&frame->rs_info, &ksig->info);
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->rs_uc.uc_flags); err |= __put_user(0, &frame->rs_uc.uc_flags);
...@@ -493,7 +488,7 @@ static int setup_rt_frame(void *sig_return, struct k_sigaction *ka, ...@@ -493,7 +488,7 @@ static int setup_rt_frame(void *sig_return, struct k_sigaction *ka,
err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set)); err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set));
if (err) if (err)
goto give_sigsegv; return -EFAULT;
/* /*
* Arguments to signal handler: * Arguments to signal handler:
...@@ -505,22 +500,18 @@ static int setup_rt_frame(void *sig_return, struct k_sigaction *ka, ...@@ -505,22 +500,18 @@ static int setup_rt_frame(void *sig_return, struct k_sigaction *ka,
* $25 and c0_epc point to the signal handler, $29 points to * $25 and c0_epc point to the signal handler, $29 points to
* the struct rt_sigframe. * the struct rt_sigframe.
*/ */
regs->regs[ 4] = signr; regs->regs[ 4] = ksig->sig;
regs->regs[ 5] = (unsigned long) &frame->rs_info; regs->regs[ 5] = (unsigned long) &frame->rs_info;
regs->regs[ 6] = (unsigned long) &frame->rs_uc; regs->regs[ 6] = (unsigned long) &frame->rs_uc;
regs->regs[29] = (unsigned long) frame; regs->regs[29] = (unsigned long) frame;
regs->regs[31] = (unsigned long) sig_return; regs->regs[31] = (unsigned long) sig_return;
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n", DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]); frame, regs->cp0_epc, regs->regs[31]);
return 0; return 0;
give_sigsegv:
force_sigsegv(signr, current);
return -EFAULT;
} }
struct mips_abi mips_abi = { struct mips_abi mips_abi = {
...@@ -534,8 +525,7 @@ struct mips_abi mips_abi = { ...@@ -534,8 +525,7 @@ struct mips_abi mips_abi = {
.restart = __NR_restart_syscall .restart = __NR_restart_syscall
}; };
static void handle_signal(unsigned long sig, siginfo_t *info, static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
struct k_sigaction *ka, struct pt_regs *regs)
{ {
sigset_t *oldset = sigmask_to_save(); sigset_t *oldset = sigmask_to_save();
int ret; int ret;
...@@ -557,7 +547,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info, ...@@ -557,7 +547,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
regs->regs[2] = EINTR; regs->regs[2] = EINTR;
break; break;
case ERESTARTSYS: case ERESTARTSYS:
if (!(ka->sa.sa_flags & SA_RESTART)) { if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
regs->regs[2] = EINTR; regs->regs[2] = EINTR;
break; break;
} }
...@@ -571,29 +561,23 @@ static void handle_signal(unsigned long sig, siginfo_t *info, ...@@ -571,29 +561,23 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
regs->regs[0] = 0; /* Don't deal with this again. */ regs->regs[0] = 0; /* Don't deal with this again. */
} }
if (sig_uses_siginfo(ka)) if (sig_uses_siginfo(&ksig->ka))
ret = abi->setup_rt_frame(vdso + abi->rt_signal_return_offset, ret = abi->setup_rt_frame(vdso + abi->rt_signal_return_offset,
ka, regs, sig, oldset, info); ksig, regs, oldset);
else else
ret = abi->setup_frame(vdso + abi->signal_return_offset, ret = abi->setup_frame(vdso + abi->signal_return_offset, ksig,
ka, regs, sig, oldset); regs, oldset);
if (ret)
return;
signal_delivered(sig, info, ka, regs, 0); signal_setup_done(ret, ksig, 0);
} }
static void do_signal(struct pt_regs *regs) static void do_signal(struct pt_regs *regs)
{ {
struct k_sigaction ka; struct ksignal ksig;
siginfo_t info;
int signr;
signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (get_signal(&ksig)) {
if (signr > 0) {
/* Whee! Actually deliver the signal. */ /* Whee! Actually deliver the signal. */
handle_signal(signr, &info, &ka, regs); handle_signal(&ksig, regs);
return; return;
} }
......
arch/mips/kernel/signal32.c
View file @ 81d103bf
...@@ -490,21 +490,21 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) ...@@ -490,21 +490,21 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
} }
static int setup_frame_32(void *sig_return, struct k_sigaction *ka, static int setup_frame_32(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, sigset_t *set) struct pt_regs *regs, sigset_t *set)
{ {
struct sigframe32 __user *frame; struct sigframe32 __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
goto give_sigsegv; return -EFAULT;
err |= setup_sigcontext32(regs, &frame->sf_sc); err |= setup_sigcontext32(regs, &frame->sf_sc);
err |= __copy_conv_sigset_to_user(&frame->sf_mask, set); err |= __copy_conv_sigset_to_user(&frame->sf_mask, set);
if (err) if (err)
goto give_sigsegv; return -EFAULT;
/* /*
* Arguments to signal handler: * Arguments to signal handler:
...@@ -516,37 +516,32 @@ static int setup_frame_32(void *sig_return, struct k_sigaction *ka, ...@@ -516,37 +516,32 @@ static int setup_frame_32(void *sig_return, struct k_sigaction *ka,
* $25 and c0_epc point to the signal handler, $29 points to the * $25 and c0_epc point to the signal handler, $29 points to the
* struct sigframe. * struct sigframe.
*/ */
regs->regs[ 4] = signr; regs->regs[ 4] = ksig->sig;
regs->regs[ 5] = 0; regs->regs[ 5] = 0;
regs->regs[ 6] = (unsigned long) &frame->sf_sc; regs->regs[ 6] = (unsigned long) &frame->sf_sc;
regs->regs[29] = (unsigned long) frame; regs->regs[29] = (unsigned long) frame;
regs->regs[31] = (unsigned long) sig_return; regs->regs[31] = (unsigned long) sig_return;
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n", DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]); frame, regs->cp0_epc, regs->regs[31]);
return 0; return 0;
give_sigsegv:
force_sigsegv(signr, current);
return -EFAULT;
} }
static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka, static int setup_rt_frame_32(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, sigset_t *set, struct pt_regs *regs, sigset_t *set)
siginfo_t *info)
{ {
struct rt_sigframe32 __user *frame; struct rt_sigframe32 __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
goto give_sigsegv; return -EFAULT;
/* Convert (siginfo_t -> compat_siginfo_t) and copy to user. */ /* Convert (siginfo_t -> compat_siginfo_t) and copy to user. */
err |= copy_siginfo_to_user32(&frame->rs_info, info); err |= copy_siginfo_to_user32(&frame->rs_info, &ksig->info);
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->rs_uc.uc_flags); err |= __put_user(0, &frame->rs_uc.uc_flags);
...@@ -556,7 +551,7 @@ static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka, ...@@ -556,7 +551,7 @@ static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka,
err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set); err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set);
if (err) if (err)
goto give_sigsegv; return -EFAULT;
/* /*
* Arguments to signal handler: * Arguments to signal handler:
...@@ -568,22 +563,18 @@ static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka, ...@@ -568,22 +563,18 @@ static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka,
* $25 and c0_epc point to the signal handler, $29 points to * $25 and c0_epc point to the signal handler, $29 points to
* the struct rt_sigframe32. * the struct rt_sigframe32.
*/ */
regs->regs[ 4] = signr; regs->regs[ 4] = ksig->sig;
regs->regs[ 5] = (unsigned long) &frame->rs_info; regs->regs[ 5] = (unsigned long) &frame->rs_info;
regs->regs[ 6] = (unsigned long) &frame->rs_uc; regs->regs[ 6] = (unsigned long) &frame->rs_uc;
regs->regs[29] = (unsigned long) frame; regs->regs[29] = (unsigned long) frame;
regs->regs[31] = (unsigned long) sig_return; regs->regs[31] = (unsigned long) sig_return;
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n", DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]); frame, regs->cp0_epc, regs->regs[31]);
return 0; return 0;
give_sigsegv:
force_sigsegv(signr, current);
return -EFAULT;
} }
/* /*
......
arch/mips/kernel/signal_n32.c
View file @ 81d103bf
...@@ -102,18 +102,18 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) ...@@ -102,18 +102,18 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
} }
static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka, static int setup_rt_frame_n32(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info) struct pt_regs *regs, sigset_t *set)
{ {
struct rt_sigframe_n32 __user *frame; struct rt_sigframe_n32 __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
goto give_sigsegv; return -EFAULT;
/* Create siginfo. */ /* Create siginfo. */
err |= copy_siginfo_to_user32(&frame->rs_info, info); err |= copy_siginfo_to_user32(&frame->rs_info, &ksig->info);
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->rs_uc.uc_flags); err |= __put_user(0, &frame->rs_uc.uc_flags);
...@@ -123,7 +123,7 @@ static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka, ...@@ -123,7 +123,7 @@ static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka,
err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set); err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set);
if (err) if (err)
goto give_sigsegv; return -EFAULT;
/* /*
* Arguments to signal handler: * Arguments to signal handler:
...@@ -135,22 +135,18 @@ static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka, ...@@ -135,22 +135,18 @@ static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka,
* $25 and c0_epc point to the signal handler, $29 points to * $25 and c0_epc point to the signal handler, $29 points to
* the struct rt_sigframe. * the struct rt_sigframe.
*/ */
regs->regs[ 4] = signr; regs->regs[ 4] = ksig->sig;
regs->regs[ 5] = (unsigned long) &frame->rs_info; regs->regs[ 5] = (unsigned long) &frame->rs_info;
regs->regs[ 6] = (unsigned long) &frame->rs_uc; regs->regs[ 6] = (unsigned long) &frame->rs_uc;
regs->regs[29] = (unsigned long) frame; regs->regs[29] = (unsigned long) frame;
regs->regs[31] = (unsigned long) sig_return; regs->regs[31] = (unsigned long) sig_return;
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n", DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, regs->regs[31]); frame, regs->cp0_epc, regs->regs[31]);
return 0; return 0;
give_sigsegv:
force_sigsegv(signr, current);
return -EFAULT;
} }
struct mips_abi mips_abi_n32 = { struct mips_abi mips_abi_n32 = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7