Commit f6dd2a3f authored by Richard Weinberger's avatar Richard Weinberger Committed by Richard Weinberger
Browse files

arc: 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>
Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 19583ca5

arch/arc/kernel/signal.c

+15 −24
Original line number Original line Diff line number Diff line
@@ -179,14 +179,13 @@ static inline int map_sig(int sig) 
}

}





static int

static int

setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,

setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)

	       sigset_t *set, struct pt_regs *regs)

{

{

	struct rt_sigframe __user *sf;

	struct rt_sigframe __user *sf;

	unsigned int magic = 0;

	unsigned int magic = 0;

	int err = 0;

	int err = 0;





	sf = get_sigframe(ka, regs, sizeof(struct rt_sigframe));

	sf = get_sigframe(&ksig->ka, regs, sizeof(struct rt_sigframe));

	if (!sf)

	if (!sf)

		return 1;

		return 1;
@@ -205,8 +204,8 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info, 
	 *  #2: struct siginfo

	 *  #2: struct siginfo

	 *  #3: struct ucontext (completely populated)

	 *  #3: struct ucontext (completely populated)

	 */

	 */

	if (unlikely(ka->sa.sa_flags & SA_SIGINFO)) {

	if (unlikely(ksig->ka.sa.sa_flags & SA_SIGINFO)) {

		err |= copy_siginfo_to_user(&sf->info, info);

		err |= copy_siginfo_to_user(&sf->info, &ksig->info);

		err |= __put_user(0, &sf->uc.uc_flags);

		err |= __put_user(0, &sf->uc.uc_flags);

		err |= __put_user(NULL, &sf->uc.uc_link);

		err |= __put_user(NULL, &sf->uc.uc_link);

		err |= __save_altstack(&sf->uc.uc_stack, regs->sp);

		err |= __save_altstack(&sf->uc.uc_stack, regs->sp);
@@ -227,16 +226,16 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info, 
		return err;

		return err;





	/* #1 arg to the user Signal handler */

	/* #1 arg to the user Signal handler */

	regs->r0 = map_sig(signo);

	regs->r0 = map_sig(ksig->sig);





	/* setup PC of user space signal handler */

	/* setup PC of user space signal handler */

	regs->ret = (unsigned long)ka->sa.sa_handler;

	regs->ret = (unsigned long)ksig->ka.sa.sa_handler;





	/*

	/*

	 * handler returns using sigreturn stub provided already by userpsace

	 * handler returns using sigreturn stub provided already by userpsace

	 */

	 */

	BUG_ON(!(ka->sa.sa_flags & SA_RESTORER));

	BUG_ON(!(ksig->ka.sa.sa_flags & SA_RESTORER));

	regs->blink = (unsigned long)ka->sa.sa_restorer;

	regs->blink = (unsigned long)ksig->ka.sa.sa_restorer;





	/* User Stack for signal handler will be above the frame just carved */

	/* User Stack for signal handler will be above the frame just carved */

	regs->sp = (unsigned long)sf;

	regs->sp = (unsigned long)sf;
@@ -298,38 +297,30 @@ static void arc_restart_syscall(struct k_sigaction *ka, struct pt_regs *regs) 
 * OK, we're invoking a handler

 * OK, we're invoking a handler

 */

 */

static void

static void

handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,

handle_signal(struct ksignal *ksig, struct pt_regs *regs)

	      struct pt_regs *regs)

{

{

	sigset_t *oldset = sigmask_to_save();

	sigset_t *oldset = sigmask_to_save();

	int ret;

	int ret;





	/* Set up the stack frame */

	/* Set up the stack frame */

	ret = setup_rt_frame(sig, ka, info, oldset, regs);

	ret = setup_rt_frame(ksig, oldset, regs);





	if (ret)

	signal_setup_done(ret, ksig, 0);

		force_sigsegv(sig, current);

	else

		signal_delivered(sig, info, ka, regs, 0);

}

}





void do_signal(struct pt_regs *regs)

void do_signal(struct pt_regs *regs)

{

{

	struct k_sigaction ka;

	struct ksignal ksig;

	siginfo_t info;

	int signr;

	int restart_scall;

	int restart_scall;





	signr = get_signal_to_deliver(&info, &ka, regs, NULL);



	restart_scall = in_syscall(regs) && syscall_restartable(regs);

	restart_scall = in_syscall(regs) && syscall_restartable(regs);





	if (signr > 0) {

	if (get_signal(&ksig)) {

		if (restart_scall) {

		if (restart_scall) {

			arc_restart_syscall(&ka, regs);

			arc_restart_syscall(&ksig.ka, regs);

			syscall_wont_restart(regs);	/* No more restarts */

			syscall_wont_restart(regs);	/* No more restarts */

		}

		}

		handle_signal(signr, &ka, &info, regs);

		handle_signal(&ksig, regs);

		return;

		return;

	}

	}