diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-01-15 02:03:38 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-01-15 02:03:38 +0000 |
| commit | dfdba55dda2b8e0913dfd737e3ebab26de12e64c (patch) | |
| tree | 043226e7f1455989e8753753335ed594ce1fd2de /sys/kern/kern_sig.c | |
| parent | Slice & dice coredump write requests into MAXPHYS blocks, and (diff) | |
| download | wireguard-openbsd-dfdba55dda2b8e0913dfd737e3ebab26de12e64c.tar.xz wireguard-openbsd-dfdba55dda2b8e0913dfd737e3ebab26de12e64c.zip | |
Allow SIGKILL to terminate coredumping processes. Semantics decided
with kettenis guenther and beck.
ok guenther
Diffstat (limited to 'sys/kern/kern_sig.c')
| -rw-r--r-- | sys/kern/kern_sig.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0820b9c0501..a817906af65 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.146 2013/01/15 01:34:27 deraadt Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.147 2013/01/15 02:03:38 deraadt Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -803,6 +803,14 @@ ptsignal(struct proc *p, int signum, enum signal_type type) mask = sigmask(signum); if (type == SPROCESS) { + /* Accept SIGKILL to coredumping processes */ + if (pr->ps_flags & PS_COREDUMP && signum == SIGKILL) { + if (pr->ps_single != NULL) + p = pr->ps_single; + atomic_setbits_int(&p->p_siglist, mask); + return; + } + /* * A process-wide signal can be diverted to a different * thread that's in sigwait() for this signal. If there @@ -1414,6 +1422,8 @@ coredump(struct proc *p) char name[sizeof("/var/crash/") + MAXCOMLEN + sizeof(".core")]; char *dir = ""; + p->p_p->ps_flags |= PS_COREDUMP; + /* * Don't dump if not root and the process has used set user or * group privileges, unless the nosuidcoredump sysctl is set to 2, @@ -1540,6 +1550,9 @@ coredump_write(void *cookie, enum uio_seg segflg, const void *data, size_t len) csize = len; do { + if (io->io_proc->p_siglist & sigmask(SIGKILL)) + return (EINTR); + /* Rest of the loop sleeps with lock held, so... */ yield(); |