M68k: Update signal delivery handling
Geert Uytterhoeven
maintainerPATCH 1/1 M68k: Update signal delivery handling
M68k: Update signal delivery handling, which was broken by the removal of notify_parent() in 2.6.9-rc2
arch/m68k/kernel/signal.c +20 -129
@@ -951,6 +951,21 @@ } } +void ptrace_signal_deliver (struct pt_regs *regs,void *cookie) +{ +if (regs->orig_d0 <0 ) +return ; +switch (regs->d0) { +case -ERESTARTNOHAND : +case -ERESTARTSYS : +case -ERESTARTNOINTR : + regs->d0 = regs->orig_d0; + regs->orig_d0 =-1 ; + regs->pc -=2 ; +break ; + } +} +/* * OK, we're invoking a handler */
@@ -982,133 +997,22 @@* Note that 'init' is a special process: it doesn't get signals it doesn't * want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. -* -* Note that we go through the signals twice: once to check the signals -* that the kernel can handle, and then we build all the user-level signal -* handling stack-frames in one go after that. */ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) {siginfo_t info; -struct k_sigaction *ka; +struct k_sigaction ka; +int signr; current->thread.esp0 = (unsigned long ) regs;if (!oldset) oldset = ¤t->blocked; -for (;;) { -int signr; - - signr =dequeue_signal (current, ¤t->blocked, &info); - -if (!signr) -break ; - -if ((current->ptrace &PT_PTRACED ) && signr !=SIGKILL ) { - current->exit_code = signr; - current->state =TASK_STOPPED ; - regs->sr &= ~PS_T ; - -/* Did we come from a system call? */ -if (regs->orig_d0 >=0 ) { -/* Restart the system call the same way as -if the process were not traced. */ -struct k_sigaction *ka = - ¤t->sighand->action[signr-1 ]; -int has_handler = - (ka->sa.sa_handler !=SIG_IGN && - ka->sa.sa_handler !=SIG_DFL ); -handle_restart (regs, ka, has_handler); - } -notify_parent (current,SIGCHLD ); -schedule (); - -/* We're back. Did the debugger cancel the sig? */ -if (!(signr = current->exit_code)) { - discard_frame: -/* Make sure that a faulted bus cycle isn't -restarted (only needed on the 680[23]0). */ -if (regs->format ==10 || regs->format ==11 ) - regs->stkadj = frame_extra_sizes[regs->format]; -continue ; - } - current->exit_code =0 ; - -/* The debugger continued. Ignore SIGSTOP. */ -if (signr ==SIGSTOP ) - goto discard_frame; - -/* Update the siginfo structure. Is this good? */ -if (signr != info.si_signo) { - info.si_signo = signr; - info.si_errno =0 ; - info.si_code =SI_USER ; - info.si_pid = current->parent->pid; - info.si_uid = current->parent->uid; - info.si_uid16 =high2lowuid (current->parent->uid); - } - -/* If the (new) signal is now blocked, requeue it. */ -if (sigismember (¤t->blocked, signr)) { -send_sig_info (signr, &info, current); -continue ; - } - } - - ka = ¤t->sighand->action[signr-1 ]; -if (ka->sa.sa_handler ==SIG_IGN ) { -if (signr !=SIGCHLD ) -continue ; -/* Check for SIGCHLD: it's special. */ -while (sys_wait4 (-1 ,NULL ,WNOHANG ,NULL ) >0 ) -/* nothing */ ; -continue ; - } - -if (ka->sa.sa_handler ==SIG_DFL ) { -int exit_code = signr; - -if (current->pid ==1 ) -continue ; - -switch (signr) { -case SIGCONT :case SIGCHLD : -case SIGWINCH :case SIGURG : -continue ; - -case SIGTSTP :case SIGTTIN :case SIGTTOU : -if (is_orphaned_pgrp (process_group (current))) -continue ; -/* FALLTHRU */ - -case SIGSTOP : { -struct sighand_struct *sighand; - current->state =TASK_STOPPED ; - current->exit_code = signr; - sighand = current->parent->sighand; -if (sighand && !(sighand->action[SIGCHLD -1 ].sa.sa_flags - &SA_NOCLDSTOP )) -notify_parent (current,SIGCHLD ); -schedule (); -continue ; - } - -case SIGQUIT :case SIGILL :case SIGTRAP : -case SIGIOT :case SIGFPE :case SIGSEGV : -case SIGBUS :case SIGSYS :case SIGXCPU :case SIGXFSZ : -if (do_coredump (signr, exit_code, regs)) - exit_code |=0x80 ; -/* FALLTHRU */ - -default : -do_group_exit (signr); -/* NOTREACHED */ - } - } - + signr =get_signal_to_deliver (&info, &ka, regs,NULL ); +if (signr >0 ) {/* Whee! Actually deliver the signal. */ -handle_signal (signr, ka, &info, oldset, regs); +handle_signal (signr, &ka, &info, oldset, regs);return 1 ; }
@@ -1117,18 +1021,5 @@/* Restart the system call - no handlers present */ handle_restart (regs,NULL ,0 ); -/* If we are about to discard some frame stuff we must copy -over the remaining frame. */ -if (regs->stkadj) { -struct pt_regs *tregs = - (struct pt_regs *) ((ulong ) regs + regs->stkadj); - -/* This must be copied with decreasing addresses to -handle overlaps. */ - tregs->vector =0 ; - tregs->format =0 ; - tregs->pc = regs->pc; - tregs->sr = regs->sr; - }return 0 ; }
include/asm-m68k/signal.h +1 -1
@@ -213,7 +213,7 @@ return word ^ 31; } -#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER +extern void ptrace_signal_deliver (struct pt_regs *regs,void *cookie);#endif /* __KERNEL__ */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 2 lines · Geert Uytterhoeven
M68k: Update signal delivery handling, which was broken by the removal of
notify_parent()in 2.6.9-rc2
After that patch the #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER in kernel/signal.c can go away now.
Geert Uytterhoeven
maintainerQuoted 6 lines · Christoph Hellwig
Quoted 2 lines · Geert Uytterhoeven
M68k: Update signal delivery handling, which was broken by the removal of
notify_parent()in 2.6.9-rc2After that patch the #ifndef
HAVE_ARCH_GET_SIGNAL_TO_DELIVERinkernel/signal.ccan go away now.
Unless arm26 wants to uncomment their #define HAVE_ARCH_GET_SIGNAL_TO_DELIVER again?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds