aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 15:22:13 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 15:22:13 -0500
commit9977d9b379cb77e0f67bd6f4563618106e58e11d (patch)
tree0191accfddf578edb52c69c933d64521e3dce297 /kernel/signal.c
parentcf4af01221579a4e895f43dbfc47598fbfc5a731 (diff)
parent541880d9a2c7871f6370071d55aa6662d329c51e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull big execve/kernel_thread/fork unification series from Al Viro: "All architectures are converted to new model. Quite a bit of that stuff is actually shared with architecture trees; in such cases it's literally shared branch pulled by both, not a cherry-pick. A lot of ugliness and black magic is gone (-3KLoC total in this one): - kernel_thread()/kernel_execve()/sys_execve() redesign. We don't do syscalls from kernel anymore for either kernel_thread() or kernel_execve(): kernel_thread() is essentially clone(2) with callback run before we return to userland, the callbacks either never return or do successful do_execve() before returning. kernel_execve() is a wrapper for do_execve() - it doesn't need to do transition to user mode anymore. As a result kernel_thread() and kernel_execve() are arch-independent now - they live in kernel/fork.c and fs/exec.c resp. sys_execve() is also in fs/exec.c and it's completely architecture-independent. - daemonize() is gone, along with its parts in fs/*.c - struct pt_regs * is no longer passed to do_fork/copy_process/ copy_thread/do_execve/search_binary_handler/->load_binary/do_coredump. - sys_fork()/sys_vfork()/sys_clone() unified; some architectures still need wrappers (ones with callee-saved registers not saved in pt_regs on syscall entry), but the main part of those suckers is in kernel/fork.c now." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (113 commits) do_coredump(): get rid of pt_regs argument print_fatal_signal(): get rid of pt_regs argument ptrace_signal(): get rid of unused arguments get rid of ptrace_signal_deliver() arguments new helper: signal_pt_regs() unify default ptrace_signal_deliver flagday: kill pt_regs argument of do_fork() death to idle_regs() don't pass regs to copy_process() flagday: don't pass regs to copy_thread() bfin: switch to generic vfork, get rid of pointless wrappers xtensa: switch to generic clone() openrisc: switch to use of generic fork and clone unicore32: switch to generic clone(2) score: switch to generic fork/vfork/clone c6x: sanitize copy_thread(), get rid of clone(2) wrapper, switch to generic clone() take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h mn10300: switch to generic fork/vfork/clone h8300: switch to generic fork/vfork/clone tile: switch to generic clone() ... Conflicts: arch/microblaze/include/asm/Kbuild
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 5ffb5626e072..a49c7f36ceb3 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1159,8 +1159,9 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
1159 return __send_signal(sig, info, t, group, from_ancestor_ns); 1159 return __send_signal(sig, info, t, group, from_ancestor_ns);
1160} 1160}
1161 1161
1162static void print_fatal_signal(struct pt_regs *regs, int signr) 1162static void print_fatal_signal(int signr)
1163{ 1163{
1164 struct pt_regs *regs = signal_pt_regs();
1164 printk("%s/%d: potentially unexpected fatal signal %d.\n", 1165 printk("%s/%d: potentially unexpected fatal signal %d.\n",
1165 current->comm, task_pid_nr(current), signr); 1166 current->comm, task_pid_nr(current), signr);
1166 1167
@@ -2131,10 +2132,9 @@ static void do_jobctl_trap(void)
2131 } 2132 }
2132} 2133}
2133 2134
2134static int ptrace_signal(int signr, siginfo_t *info, 2135static int ptrace_signal(int signr, siginfo_t *info)
2135 struct pt_regs *regs, void *cookie)
2136{ 2136{
2137 ptrace_signal_deliver(regs, cookie); 2137 ptrace_signal_deliver();
2138 /* 2138 /*
2139 * We do not check sig_kernel_stop(signr) but set this marker 2139 * We do not check sig_kernel_stop(signr) but set this marker
2140 * unconditionally because we do not know whether debugger will 2140 * unconditionally because we do not know whether debugger will
@@ -2257,8 +2257,7 @@ relock:
2257 break; /* will return 0 */ 2257 break; /* will return 0 */
2258 2258
2259 if (unlikely(current->ptrace) && signr != SIGKILL) { 2259 if (unlikely(current->ptrace) && signr != SIGKILL) {
2260 signr = ptrace_signal(signr, info, 2260 signr = ptrace_signal(signr, info);
2261 regs, cookie);
2262 if (!signr) 2261 if (!signr)
2263 continue; 2262 continue;
2264 } 2263 }
@@ -2343,7 +2342,7 @@ relock:
2343 2342
2344 if (sig_kernel_coredump(signr)) { 2343 if (sig_kernel_coredump(signr)) {
2345 if (print_fatal_signals) 2344 if (print_fatal_signals)
2346 print_fatal_signal(regs, info->si_signo); 2345 print_fatal_signal(info->si_signo);
2347 /* 2346 /*
2348 * If it was able to dump core, this kills all 2347 * If it was able to dump core, this kills all
2349 * other threads in the group and synchronizes with 2348 * other threads in the group and synchronizes with
@@ -2352,7 +2351,7 @@ relock:
2352 * first and our do_group_exit call below will use 2351 * first and our do_group_exit call below will use
2353 * that value and ignore the one we pass it. 2352 * that value and ignore the one we pass it.
2354 */ 2353 */
2355 do_coredump(info, regs); 2354 do_coredump(info);
2356 } 2355 }
2357 2356
2358 /* 2357 /*