projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_4_Lite1 release
[unix-history] / usr / src / sys / kern / kern_sig.c
diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index 777b97e..3dcff92 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,128 +1,174 @@
 /*
 /*
- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1989, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
  *
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
  *
- *     @(#)kern_sig.c  7.3.1.1 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)kern_sig.c  8.7 (Berkeley) 4/18/94
  */
 
  */
 
-#include "param.h"
-#include "systm.h"
-#include "dir.h"
-#include "ucred.h"
-#include "user.h"
-#include "vnode.h"
-#include "proc.h"
-#include "timeb.h"
-#include "times.h"
-#include "buf.h"
-#include "mount.h"
-#include "text.h"
-#include "seg.h"
-#include "vm.h"
-#include "acct.h"
-#include "uio.h"
-#include "file.h"
-#include "kernel.h"
-
-#include "machine/reg.h"
-#include "machine/pte.h"
-#include "machine/psl.h"
-#include "machine/mtpr.h"
-
-#define        cantmask        (sigmask(SIGKILL)|sigmask(SIGCONT)|sigmask(SIGSTOP))
-#define        stopsigmask     (sigmask(SIGSTOP)|sigmask(SIGTSTP)| \
-                       sigmask(SIGTTIN)|sigmask(SIGTTOU))
+#define        SIGPROP         /* include signal properties table */
+#include <sys/param.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/timeb.h>
+#include <sys/times.h>
+#include <sys/buf.h>
+#include <sys/acct.h>
+#include <sys/file.h>
+#include <sys/kernel.h>
+#include <sys/wait.h>
+#include <sys/ktrace.h>
+#include <sys/syslog.h>
+#include <sys/stat.h>
+
+#include <machine/cpu.h>
+
+#include <vm/vm.h>
+#include <sys/user.h>          /* for coredump */
 
 /*
 
 /*
- * Generalized interface signal handler.
+ * Can process p, with pcred pc, send the signal signum to process q?
  */
  */
-sigvec()
+#define CANSIGNAL(p, pc, q, signum) \
+       ((pc)->pc_ucred->cr_uid == 0 || \
+           (pc)->p_ruid == (q)->p_cred->p_ruid || \
+           (pc)->pc_ucred->cr_uid == (q)->p_cred->p_ruid || \
+           (pc)->p_ruid == (q)->p_ucred->cr_uid || \
+           (pc)->pc_ucred->cr_uid == (q)->p_ucred->cr_uid || \
+           ((signum) == SIGCONT && (q)->p_session == (p)->p_session))
+
+struct sigaction_args {
+       int     signum;
+       struct  sigaction *nsa;
+       struct  sigaction *osa;
+};
+/* ARGSUSED */
+sigaction(p, uap, retval)
+       struct proc *p;
+       register struct sigaction_args *uap;
+       int *retval;
 {
 {
-       register struct a {
-               int     signo;
-               struct  sigvec *nsv;
-               struct  sigvec *osv;
-       } *uap = (struct a  *)u.u_ap;
-       struct sigvec vec;
-       register struct sigvec *sv;
-       register int sig;
-       int bit;
+       struct sigaction vec;
+       register struct sigaction *sa;
+       register struct sigacts *ps = p->p_sigacts;
+       register int signum;
+       int bit, error;
 
 
-       sig = uap->signo;
-       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP) {
-               u.u_error = EINVAL;
-               return;
-       }
-       sv = &vec;
-       if (uap->osv) {
-               sv->sv_handler = u.u_signal[sig];
-               sv->sv_mask = u.u_sigmask[sig];
-               bit = sigmask(sig);
-               sv->sv_flags = 0;
-               if ((u.u_sigonstack & bit) != 0)
-                       sv->sv_flags |= SV_ONSTACK;
-               if ((u.u_sigintr & bit) != 0)
-                       sv->sv_flags |= SV_INTERRUPT;
-               u.u_error =
-                   copyout((caddr_t)sv, (caddr_t)uap->osv, sizeof (vec));
-               if (u.u_error)
-                       return;
+       signum = uap->signum;
+       if (signum <= 0 || signum >= NSIG ||
+           signum == SIGKILL || signum == SIGSTOP)
+               return (EINVAL);
+       sa = &vec;
+       if (uap->osa) {
+               sa->sa_handler = ps->ps_sigact[signum];
+               sa->sa_mask = ps->ps_catchmask[signum];
+               bit = sigmask(signum);
+               sa->sa_flags = 0;
+               if ((ps->ps_sigonstack & bit) != 0)
+                       sa->sa_flags |= SA_ONSTACK;
+               if ((ps->ps_sigintr & bit) == 0)
+                       sa->sa_flags |= SA_RESTART;
+               if (p->p_flag & P_NOCLDSTOP)
+                       sa->sa_flags |= SA_NOCLDSTOP;
+               if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
+                   sizeof (vec)))
+                       return (error);
        }
        }
-       if (uap->nsv) {
-               u.u_error =
-                   copyin((caddr_t)uap->nsv, (caddr_t)sv, sizeof (vec));
-               if (u.u_error)
-                       return;
-               if (sig == SIGCONT && sv->sv_handler == SIG_IGN) {
-                       u.u_error = EINVAL;
-                       return;
-               }
-               setsigvec(sig, sv);
+       if (uap->nsa) {
+               if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
+                   sizeof (vec)))
+                       return (error);
+               setsigvec(p, signum, sa);
        }
        }
+       return (0);
 }
 
 }
 
-setsigvec(sig, sv)
-       int sig;
-       register struct sigvec *sv;
-{
+setsigvec(p, signum, sa)
        register struct proc *p;
        register struct proc *p;
+       int signum;
+       register struct sigaction *sa;
+{
+       register struct sigacts *ps = p->p_sigacts;
        register int bit;
 
        register int bit;
 
-       bit = sigmask(sig);
-       p = u.u_procp;
+       bit = sigmask(signum);
        /*
         * Change setting atomically.
         */
        (void) splhigh();
        /*
         * Change setting atomically.
         */
        (void) splhigh();
-       u.u_signal[sig] = sv->sv_handler;
-       u.u_sigmask[sig] = sv->sv_mask &~ cantmask;
-       if (sv->sv_flags & SV_INTERRUPT)
-               u.u_sigintr |= bit;
+       ps->ps_sigact[signum] = sa->sa_handler;
+       ps->ps_catchmask[signum] = sa->sa_mask &~ sigcantmask;
+       if ((sa->sa_flags & SA_RESTART) == 0)
+               ps->ps_sigintr |= bit;
+       else
+               ps->ps_sigintr &= ~bit;
+       if (sa->sa_flags & SA_ONSTACK)
+               ps->ps_sigonstack |= bit;
        else
        else
-               u.u_sigintr &= ~bit;
-       if (sv->sv_flags & SV_ONSTACK)
-               u.u_sigonstack |= bit;
+               ps->ps_sigonstack &= ~bit;
+#ifdef COMPAT_SUNOS
+       if (sa->sa_flags & SA_USERTRAMP)
+               ps->ps_usertramp |= bit;
        else
        else
-               u.u_sigonstack &= ~bit;
-       if (sv->sv_handler == SIG_IGN) {
-               p->p_sig &= ~bit;               /* never to be seen again */
-               p->p_sigignore |= bit;
+               ps->ps_usertramp &= ~bit;
+#endif
+       if (signum == SIGCHLD) {
+               if (sa->sa_flags & SA_NOCLDSTOP)
+                       p->p_flag |= P_NOCLDSTOP;
+               else
+                       p->p_flag &= ~P_NOCLDSTOP;
+       }
+       /*
+        * Set bit in p_sigignore for signals that are set to SIG_IGN,
+        * and for signals set to SIG_DFL where the default is to ignore.
+        * However, don't put SIGCONT in p_sigignore,
+        * as we have to restart the process.
+        */
+       if (sa->sa_handler == SIG_IGN ||
+           (sigprop[signum] & SA_IGNORE && sa->sa_handler == SIG_DFL)) {
+               p->p_siglist &= ~bit;           /* never to be seen again */
+               if (signum != SIGCONT)
+                       p->p_sigignore |= bit;  /* easier in psignal */
                p->p_sigcatch &= ~bit;
        } else {
                p->p_sigignore &= ~bit;
                p->p_sigcatch &= ~bit;
        } else {
                p->p_sigignore &= ~bit;
-               if (sv->sv_handler == SIG_DFL)
+               if (sa->sa_handler == SIG_DFL)
                        p->p_sigcatch &= ~bit;
                else
                        p->p_sigcatch |= bit;
                        p->p_sigcatch &= ~bit;
                else
                        p->p_sigcatch |= bit;
@@ -130,238 +176,513 @@ setsigvec(sig, sv)
        (void) spl0();
 }
 
        (void) spl0();
 }
 
-sigblock()
+/*
+ * Initialize signal state for process 0;
+ * set to ignore signals that are ignored by default.
+ */
+void
+siginit(p)
+       struct proc *p;
 {
 {
-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
+       register int i;
+
+       for (i = 0; i < NSIG; i++)
+               if (sigprop[i] & SA_IGNORE && i != SIGCONT)
+                       p->p_sigignore |= sigmask(i);
+}
 
 
+/*
+ * Reset signals for an exec of the specified process.
+ */
+void
+execsigs(p)
+       register struct proc *p;
+{
+       register struct sigacts *ps = p->p_sigacts;
+       register int nc, mask;
+
+       /*
+        * Reset caught signals.  Held signals remain held
+        * through p_sigmask (unless they were caught,
+        * and are now ignored by default).
+        */
+       while (p->p_sigcatch) {
+               nc = ffs((long)p->p_sigcatch);
+               mask = sigmask(nc);
+               p->p_sigcatch &= ~mask;
+               if (sigprop[nc] & SA_IGNORE) {
+                       if (nc != SIGCONT)
+                               p->p_sigignore |= mask;
+                       p->p_siglist &= ~mask;
+               }
+               ps->ps_sigact[nc] = SIG_DFL;
+       }
+       /*
+        * Reset stack state to the user stack.
+        * Clear set of signals caught on the signal stack.
+        */
+       ps->ps_sigstk.ss_flags = SA_DISABLE;
+       ps->ps_sigstk.ss_size = 0;
+       ps->ps_sigstk.ss_base = 0;
+       ps->ps_flags = 0;
+}
+
+/*
+ * Manipulate signal mask.
+ * Note that we receive new mask, not pointer,
+ * and return old mask as return value;
+ * the library stub does the rest.
+ */
+struct sigprocmask_args {
+       int     how;
+       sigset_t mask;
+};
+sigprocmask(p, uap, retval)
+       register struct proc *p;
+       struct sigprocmask_args *uap;
+       int *retval;
+{
+       int error = 0;
+
+       *retval = p->p_sigmask;
        (void) splhigh();
        (void) splhigh();
-       u.u_r.r_val1 = p->p_sigmask;
-       p->p_sigmask |= uap->mask &~ cantmask;
+
+       switch (uap->how) {
+       case SIG_BLOCK:
+               p->p_sigmask |= uap->mask &~ sigcantmask;
+               break;
+
+       case SIG_UNBLOCK:
+               p->p_sigmask &= ~uap->mask;
+               break;
+
+       case SIG_SETMASK:
+               p->p_sigmask = uap->mask &~ sigcantmask;
+               break;
+       
+       default:
+               error = EINVAL;
+               break;
+       }
        (void) spl0();
        (void) spl0();
+       return (error);
 }
 
 }
 
-sigsetmask()
+struct sigpending_args {
+       int     dummy;
+};
+/* ARGSUSED */
+sigpending(p, uap, retval)
+       struct proc *p;
+       struct sigpending_args *uap;
+       int *retval;
+{
+
+       *retval = p->p_siglist;
+       return (0);
+}
+
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+/*
+ * Generalized interface signal handler, 4.3-compatible.
+ */
+struct osigvec_args {
+       int     signum;
+       struct  sigvec *nsv;
+       struct  sigvec *osv;
+};
+/* ARGSUSED */
+osigvec(p, uap, retval)
+       struct proc *p;
+       register struct osigvec_args *uap;
+       int *retval;
+{
+       struct sigvec vec;
+       register struct sigacts *ps = p->p_sigacts;
+       register struct sigvec *sv;
+       register int signum;
+       int bit, error;
+
+       signum = uap->signum;
+       if (signum <= 0 || signum >= NSIG ||
+           signum == SIGKILL || signum == SIGSTOP)
+               return (EINVAL);
+       sv = &vec;
+       if (uap->osv) {
+               *(sig_t *)&sv->sv_handler = ps->ps_sigact[signum];
+               sv->sv_mask = ps->ps_catchmask[signum];
+               bit = sigmask(signum);
+               sv->sv_flags = 0;
+               if ((ps->ps_sigonstack & bit) != 0)
+                       sv->sv_flags |= SV_ONSTACK;
+               if ((ps->ps_sigintr & bit) != 0)
+                       sv->sv_flags |= SV_INTERRUPT;
+#ifndef COMPAT_SUNOS
+               if (p->p_flag & P_NOCLDSTOP)
+                       sv->sv_flags |= SA_NOCLDSTOP;
+#endif
+               if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
+                   sizeof (vec)))
+                       return (error);
+       }
+       if (uap->nsv) {
+               if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
+                   sizeof (vec)))
+                       return (error);
+#ifdef COMPAT_SUNOS
+               /*
+                * SunOS uses this bit (4, aka SA_DISABLE) as SV_RESETHAND,
+                * `reset to SIG_DFL on delivery'. We have no such option
+                * now or ever!
+                */
+               if (sv->sv_flags & SA_DISABLE)
+                       return (EINVAL);
+               sv->sv_flags |= SA_USERTRAMP;
+#endif
+               sv->sv_flags ^= SA_RESTART;     /* opposite of SV_INTERRUPT */
+               setsigvec(p, signum, (struct sigaction *)sv);
+       }
+       return (0);
+}
+
+struct osigblock_args {
+       int     mask;
+};
+osigblock(p, uap, retval)
+       register struct proc *p;
+       struct osigblock_args *uap;
+       int *retval;
 {
 {
-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
 
        (void) splhigh();
 
        (void) splhigh();
-       u.u_r.r_val1 = p->p_sigmask;
-       p->p_sigmask = uap->mask &~ cantmask;
+       *retval = p->p_sigmask;
+       p->p_sigmask |= uap->mask &~ sigcantmask;
        (void) spl0();
        (void) spl0();
+       return (0);
 }
 
 }
 
-sigpause()
+struct osigsetmask_args {
+       int     mask;
+};
+osigsetmask(p, uap, retval)
+       struct proc *p;
+       struct osigsetmask_args *uap;
+       int *retval;
 {
 {
-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
+
+       (void) splhigh();
+       *retval = p->p_sigmask;
+       p->p_sigmask = uap->mask &~ sigcantmask;
+       (void) spl0();
+       return (0);
+}
+#endif /* COMPAT_43 || COMPAT_SUNOS */
+
+/*
+ * Suspend process until signal, providing mask to be set
+ * in the meantime.  Note nonstandard calling convention:
+ * libc stub passes mask, not pointer, to save a copyin.
+ */
+struct sigsuspend_args {
+       sigset_t mask;
+};
+/* ARGSUSED */
+sigsuspend(p, uap, retval)
+       register struct proc *p;
+       struct sigsuspend_args *uap;
+       int *retval;
+{
+       register struct sigacts *ps = p->p_sigacts;
 
        /*
         * When returning from sigpause, we want
         * the old mask to be restored after the
         * signal handler has finished.  Thus, we
 
        /*
         * When returning from sigpause, we want
         * the old mask to be restored after the
         * signal handler has finished.  Thus, we
-        * save it here and mark the proc structure
-        * to indicate this (should be in u.).
+        * save it here and mark the sigacts structure
+        * to indicate this.
         */
         */
-       u.u_oldmask = p->p_sigmask;
-       p->p_flag |= SOMASK;
-       p->p_sigmask = uap->mask &~ cantmask;
-       for (;;)
-               sleep((caddr_t)&u, PSLEP);
-       /*NOTREACHED*/
+       ps->ps_oldmask = p->p_sigmask;
+       ps->ps_flags |= SAS_OLDMASK;
+       p->p_sigmask = uap->mask &~ sigcantmask;
+       while (tsleep((caddr_t) ps, PPAUSE|PCATCH, "pause", 0) == 0)
+               /* void */;
+       /* always return EINTR rather than ERESTART... */
+       return (EINTR);
 }
 }
-#undef cantmask
 
 
-sigstack()
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct osigstack_args {
+       struct  sigstack *nss;
+       struct  sigstack *oss;
+};
+/* ARGSUSED */
+osigstack(p, uap, retval)
+       struct proc *p;
+       register struct osigstack_args *uap;
+       int *retval;
 {
 {
-       register struct a {
-               struct  sigstack *nss;
-               struct  sigstack *oss;
-       } *uap = (struct a *)u.u_ap;
        struct sigstack ss;
        struct sigstack ss;
+       struct sigacts *psp;
+       int error = 0;
 
 
-       if (uap->oss) {
-               u.u_error = copyout((caddr_t)&u.u_sigstack, (caddr_t)uap->oss, 
-                   sizeof (struct sigstack));
-               if (u.u_error)
-                       return;
+       psp = p->p_sigacts;
+       ss.ss_sp = psp->ps_sigstk.ss_base;
+       ss.ss_onstack = psp->ps_sigstk.ss_flags & SA_ONSTACK;
+       if (uap->oss && (error = copyout((caddr_t)&ss, (caddr_t)uap->oss,
+           sizeof (struct sigstack))))
+               return (error);
+       if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
+           sizeof (ss))) == 0) {
+               psp->ps_sigstk.ss_base = ss.ss_sp;
+               psp->ps_sigstk.ss_size = 0;
+               psp->ps_sigstk.ss_flags |= ss.ss_onstack & SA_ONSTACK;
+               psp->ps_flags |= SAS_ALTSTACK;
        }
        }
-       if (uap->nss) {
-               u.u_error =
-                   copyin((caddr_t)uap->nss, (caddr_t)&ss, sizeof (ss));
-               if (u.u_error == 0)
-                       u.u_sigstack = ss;
+       return (error);
+}
+#endif /* COMPAT_43 || COMPAT_SUNOS */
+
+struct sigaltstack_args {
+       struct  sigaltstack *nss;
+       struct  sigaltstack *oss;
+};
+/* ARGSUSED */
+sigaltstack(p, uap, retval)
+       struct proc *p;
+       register struct sigaltstack_args *uap;
+       int *retval;
+{
+       struct sigacts *psp;
+       struct sigaltstack ss;
+       int error;
+
+       psp = p->p_sigacts;
+       if ((psp->ps_flags & SAS_ALTSTACK) == 0)
+               psp->ps_sigstk.ss_flags |= SA_DISABLE;
+       if (uap->oss && (error = copyout((caddr_t)&psp->ps_sigstk,
+           (caddr_t)uap->oss, sizeof (struct sigaltstack))))
+               return (error);
+       if (uap->nss == 0)
+               return (0);
+       if (error = copyin((caddr_t)uap->nss, (caddr_t)&ss, sizeof (ss)))
+               return (error);
+       if (ss.ss_flags & SA_DISABLE) {
+               if (psp->ps_sigstk.ss_flags & SA_ONSTACK)
+                       return (EINVAL);
+               psp->ps_flags &= ~SAS_ALTSTACK;
+               psp->ps_sigstk.ss_flags = ss.ss_flags;
+               return (0);
        }
        }
+       if (ss.ss_size < MINSIGSTKSZ)
+               return (ENOMEM);
+       psp->ps_flags |= SAS_ALTSTACK;
+       psp->ps_sigstk= ss;
+       return (0);
 }
 
 }
 
-kill()
+struct kill_args {
+       int     pid;
+       int     signum;
+};
+/* ARGSUSED */
+kill(cp, uap, retval)
+       register struct proc *cp;
+       register struct kill_args *uap;
+       int *retval;
 {
 {
-       register struct a {
-               int     pid;
-               int     signo;
-       } *uap = (struct a *)u.u_ap;
        register struct proc *p;
        register struct proc *p;
+       register struct pcred *pc = cp->p_cred;
 
 
-       if (uap->signo < 0 || uap->signo > NSIG) {
-               u.u_error = EINVAL;
-               return;
-       }
+       if ((u_int)uap->signum >= NSIG)
+               return (EINVAL);
        if (uap->pid > 0) {
                /* kill single process */
        if (uap->pid > 0) {
                /* kill single process */
-               p = pfind(uap->pid);
-               if (p == 0) {
-                       u.u_error = ESRCH;
-                       return;
-               }
-               if (u.u_uid && u.u_uid != p->p_uid)
-                       u.u_error = EPERM;
-               else if (uap->signo)
-                       psignal(p, uap->signo);
-               return;
+               if ((p = pfind(uap->pid)) == NULL)
+                       return (ESRCH);
+               if (!CANSIGNAL(cp, pc, p, uap->signum))
+                       return (EPERM);
+               if (uap->signum)
+                       psignal(p, uap->signum);
+               return (0);
        }
        switch (uap->pid) {
        case -1:                /* broadcast signal */
        }
        switch (uap->pid) {
        case -1:                /* broadcast signal */
-               u.u_error = killpg1(uap->signo, 0, 1);
-               break;
+               return (killpg1(cp, uap->signum, 0, 1));
        case 0:                 /* signal own process group */
        case 0:                 /* signal own process group */
-               u.u_error = killpg1(uap->signo, 0, 0);
-               break;
+               return (killpg1(cp, uap->signum, 0, 0));
        default:                /* negative explicit process group */
        default:                /* negative explicit process group */
-               u.u_error = killpg1(uap->signo, -uap->pid, 0);
-               break;
+               return (killpg1(cp, uap->signum, -uap->pid, 0));
        }
        }
-       return;
+       /* NOTREACHED */
 }
 
 }
 
-killpg()
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct okillpg_args {
+       int     pgid;
+       int     signum;
+};
+/* ARGSUSED */
+okillpg(p, uap, retval)
+       struct proc *p;
+       register struct okillpg_args *uap;
+       int *retval;
 {
 {
-       register struct a {
-               int     pgid;
-               int     signo;
-       } *uap = (struct a *)u.u_ap;
 
 
-       if (uap->signo < 0 || uap->signo > NSIG) {
-               u.u_error = EINVAL;
-               return;
-       }
-       u.u_error = killpg1(uap->signo, uap->pgid, 0);
+       if ((u_int)uap->signum >= NSIG)
+               return (EINVAL);
+       return (killpg1(p, uap->signum, uap->pgid, 0));
 }
 }
+#endif /* COMPAT_43 || COMPAT_SUNOS */
 
 
-/* KILL CODE SHOULDNT KNOW ABOUT PROCESS INTERNALS !?! */
-
-killpg1(signo, pgid, all)
-       int signo, pgid, all;
+/*
+ * Common code for kill process group/broadcast kill.
+ * cp is calling process.
+ */
+killpg1(cp, signum, pgid, all)
+       register struct proc *cp;
+       int signum, pgid, all;
 {
        register struct proc *p;
 {
        register struct proc *p;
+       register struct pcred *pc = cp->p_cred;
        struct pgrp *pgrp;
        struct pgrp *pgrp;
-       int f = 0, error = 0;
-
+       int nfound = 0;
        
        if (all)        
                /* 
                 * broadcast 
                 */
        
        if (all)        
                /* 
                 * broadcast 
                 */
-               for (p = allproc; p != NULL; p = p->p_nxt) {
-                       if (p->p_ppid == 0 || p->p_flag&SSYS || 
-                           p == u.u_procp ||
-                          (u.u_uid && u.u_uid != p->p_uid && 
-                          !(signo == SIGCONT && inferior(p))))
+               for (p = (struct proc *)allproc; p != NULL; p = p->p_next) {
+                       if (p->p_pid <= 1 || p->p_flag & P_SYSTEM || 
+                           p == cp || !CANSIGNAL(cp, pc, p, signum))
                                continue;
                                continue;
-                       f++;
-                       if (signo)
-                               psignal(p, signo);
+                       nfound++;
+                       if (signum)
+                               psignal(p, signum);
                }
        else {
                if (pgid == 0)          
                        /* 
                         * zero pgid means send to my process group.
                         */
                }
        else {
                if (pgid == 0)          
                        /* 
                         * zero pgid means send to my process group.
                         */
-                       pgrp = u.u_procp->p_pgrp;
+                       pgrp = cp->p_pgrp;
                else {
                        pgrp = pgfind(pgid);
                        if (pgrp == NULL)
                else {
                        pgrp = pgfind(pgid);
                        if (pgrp == NULL)
-                               return(ESRCH);
+                               return (ESRCH);
                }
                }
-               if (!(pgrp->pg_jobc) && 
-                    (signo==SIGTTIN || signo==SIGTTOU || signo==SIGTSTP))
-                       return(EPERM);
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
-                       if (p->p_ppid == 0 || p->p_flag&SSYS)
+                       if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
+                           p->p_stat == SZOMB ||
+                           !CANSIGNAL(cp, pc, p, signum))
                                continue;
                                continue;
-                       if (u.u_uid && u.u_uid != p->p_uid && 
-                          !(signo == SIGCONT && inferior(p))) {
-                               error = EPERM;
-                               continue;
-                       }
-                       f++;
-                       if (signo)
-                               psignal(p, signo);
+                       nfound++;
+                       if (signum)
+                               psignal(p, signum);
                }
        }
                }
        }
-       return (error ? error : (f == 0 ? ESRCH : 0));
+       return (nfound ? 0 : ESRCH);
 }
 
 /*
 }
 
 /*
- * Send the specified signal to
- * all processes with 'pgid' as
- * process group.
+ * Send a signal to a process group.
  */
  */
-gsignal(pgid, sig)
+void
+gsignal(pgid, signum)
+       int pgid, signum;
 {
 {
-       register struct pgrp *pgrp;
-       register struct proc *p;
+       struct pgrp *pgrp;
 
 
-       if (!pgid)
-               return;
-       if ((pgrp = pgfind(pgid)) == NULL)
-               return;
-       pgsignal(pgrp, sig);
+       if (pgid && (pgrp = pgfind(pgid)))
+               pgsignal(pgrp, signum, 0);
 }
 
 }
 
-pgsignal(pgrp, sig)
-       register struct pgrp *pgrp;
+/*
+ * Send a signal to a  process group.  If checktty is 1,
+ * limit to members which have a controlling terminal.
+ */
+void
+pgsignal(pgrp, signum, checkctty)
+       struct pgrp *pgrp;
+       int signum, checkctty;
 {
        register struct proc *p;
 
 {
        register struct proc *p;
 
-       if (!(pgrp->pg_jobc) && 
-            (sig==SIGTTIN || sig==SIGTTOU || sig==SIGTSTP))
-               return;
-       for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt)
-               psignal(p, sig);
+       if (pgrp)
+               for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt)
+                       if (checkctty == 0 || p->p_flag & P_CONTROLT)
+                               psignal(p, signum);
 }
 
 /*
 }
 
 /*
- * Send the specified signal to
- * the specified process.
+ * Send a signal caused by a trap to the current process.
+ * If it will be caught immediately, deliver it with correct code.
+ * Otherwise, post it normally.
  */
  */
-psignal(p, sig)
+void
+trapsignal(p, signum, code)
+       struct proc *p;
+       register int signum;
+       u_int code;
+{
+       register struct sigacts *ps = p->p_sigacts;
+       int mask;
+
+       mask = sigmask(signum);
+       if ((p->p_flag & P_TRACED) == 0 && (p->p_sigcatch & mask) != 0 &&
+           (p->p_sigmask & mask) == 0) {
+               p->p_stats->p_ru.ru_nsignals++;
+#ifdef KTRACE
+               if (KTRPOINT(p, KTR_PSIG))
+                       ktrpsig(p->p_tracep, signum, ps->ps_sigact[signum], 
+                               p->p_sigmask, code);
+#endif
+               sendsig(ps->ps_sigact[signum], signum, p->p_sigmask, code);
+               p->p_sigmask |= ps->ps_catchmask[signum] | mask;
+       } else {
+               ps->ps_code = code;     /* XXX for core dump/debugger */
+               psignal(p, signum);
+       }
+}
+
+/*
+ * Send the signal to the process.  If the signal has an action, the action
+ * is usually performed by the target process rather than the caller; we add
+ * the signal to the set of pending signals for the process.
+ *
+ * Exceptions:
+ *   o When a stop signal is sent to a sleeping process that takes the
+ *     default action, the process is stopped without awakening it.
+ *   o SIGCONT restarts stopped processes (or puts them back to sleep)
+ *     regardless of the signal action (eg, blocked or ignored).
+ *
+ * Other ignored signals are discarded immediately.
+ */
+void
+psignal(p, signum)
        register struct proc *p;
        register struct proc *p;
-       register int sig;
+       register int signum;
 {
 {
-       register int s;
-       register int (*action)();
+       register int s, prop;
+       register sig_t action;
        int mask;
 
        int mask;
 
-       if ((unsigned)sig >= NSIG)
-               return;
-       mask = sigmask(sig);
+       if ((u_int)signum >= NSIG || signum == 0)
+               panic("psignal signal number");
+       mask = sigmask(signum);
+       prop = sigprop[signum];
 
        /*
         * If proc is traced, always give parent a chance.
         */
 
        /*
         * If proc is traced, always give parent a chance.
         */
-       if (p->p_flag & STRC)
+       if (p->p_flag & P_TRACED)
                action = SIG_DFL;
        else {
                /*
                 * If the signal is being ignored,
                 * then we forget about it immediately.
                action = SIG_DFL;
        else {
                /*
                 * If the signal is being ignored,
                 * then we forget about it immediately.
+                * (Note: we don't set SIGCONT in p_sigignore,
+                * and if it is set to SIG_IGN,
+                * action will be SIG_DFL here.)
                 */
                if (p->p_sigignore & mask)
                        return;
                 */
                if (p->p_sigignore & mask)
                        return;
@@ -372,101 +693,85 @@ psignal(p, sig)
                else
                        action = SIG_DFL;
        }
                else
                        action = SIG_DFL;
        }
-       if (sig) {
-               switch (sig) {
 
 
-               case SIGTERM:
-                       if ((p->p_flag&STRC) || action != SIG_DFL)
-                               break;
-                       /* fall into ... */
-
-               case SIGKILL:
-                       if (p->p_nice > NZERO)
-                               p->p_nice = NZERO;
-                       break;
-
-               case SIGCONT:
-                       p->p_sig &= ~stopsigmask;
-                       break;
-
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       /*FALLTHROUGH*/
-               case SIGSTOP:
-                       p->p_sig &= ~sigmask(SIGCONT);
-                       break;
-               }
-               p->p_sig |= mask;
+       if (p->p_nice > NZERO && action == SIG_DFL && (prop & SA_KILL) &&
+           (p->p_flag & P_TRACED) == 0)
+               p->p_nice = NZERO;
+
+       if (prop & SA_CONT)
+               p->p_siglist &= ~stopsigmask;
+
+       if (prop & SA_STOP) {
+               /*
+                * If sending a tty stop signal to a member of an orphaned
+                * process group, discard the signal here if the action
+                * is default; don't stop the process below if sleeping,
+                * and don't clear any pending SIGCONT.
+                */
+               if (prop & SA_TTYSTOP && p->p_pgrp->pg_jobc == 0 &&
+                   action == SIG_DFL)
+                       return;
+               p->p_siglist &= ~contsigmask;
        }
        }
+       p->p_siglist |= mask;
+
        /*
        /*
-        * Defer further processing for signals which are held.
+        * Defer further processing for signals which are held,
+        * except that stopped processes must be continued by SIGCONT.
         */
         */
-       if (action == SIG_HOLD)
+       if (action == SIG_HOLD && ((prop & SA_CONT) == 0 || p->p_stat != SSTOP))
                return;
        s = splhigh();
        switch (p->p_stat) {
 
        case SSLEEP:
                /*
                return;
        s = splhigh();
        switch (p->p_stat) {
 
        case SSLEEP:
                /*
-                * If process is sleeping at negative priority
+                * If process is sleeping uninterruptibly
                 * we can't interrupt the sleep... the signal will
                 * be noticed when the process returns through
                 * trap() or syscall().
                 */
                 * we can't interrupt the sleep... the signal will
                 * be noticed when the process returns through
                 * trap() or syscall().
                 */
-               if (p->p_pri <= PZERO)
+               if ((p->p_flag & P_SINTR) == 0)
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
-                * so it can discover the signal in issig() and stop
+                * so it can discover the signal in issignal() and stop
                 * for the parent.
                 */
                 * for the parent.
                 */
-               if (p->p_flag&STRC)
+               if (p->p_flag & P_TRACED)
                        goto run;
                        goto run;
-               switch (sig) {
-
-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       /*
-                        * These are the signals which by default
-                        * stop a process.
-                        */
+               /*
+                * If SIGCONT is default (or ignored) and process is
+                * asleep, we are finished; the process should not
+                * be awakened.
+                */
+               if ((prop & SA_CONT) && action == SIG_DFL) {
+                       p->p_siglist &= ~mask;
+                       goto out;
+               }
+               /*
+                * When a sleeping process receives a stop
+                * signal, process immediately if possible.
+                * All other (caught or default) signals
+                * cause the process to run.
+                */
+               if (prop & SA_STOP) {
                        if (action != SIG_DFL)
                        if (action != SIG_DFL)
-                               goto run;
+                               goto runfast;
                        /*
                        /*
-                        * If a child in vfork(), stopping could
-                        * cause deadlock.
+                        * If a child holding parent blocked,
+                        * stopping could cause deadlock.
                         */
                         */
-                       if (p->p_flag&SVFORK)
+                       if (p->p_flag & P_PPWAIT)
                                goto out;
                                goto out;
-                       p->p_sig &= ~mask;
-                       p->p_cursig = sig;
-                       psignal(p->p_pptr, SIGCHLD);
+                       p->p_siglist &= ~mask;
+                       p->p_xstat = signum;
+                       if ((p->p_pptr->p_flag & P_NOCLDSTOP) == 0)
+                               psignal(p->p_pptr, SIGCHLD);
                        stop(p);
                        goto out;
                        stop(p);
                        goto out;
-
-               case SIGIO:
-               case SIGURG:
-               case SIGCHLD:
-               case SIGWINCH:
-                       /*
-                        * These signals are special in that they
-                        * don't get propogated... if the process
-                        * isn't interested, forget it.
-                        */
-                       if (action != SIG_DFL)
-                               goto run;
-                       p->p_sig &= ~mask;              /* take it away */
-                       goto out;
-
-               default:
-                       /*
-                        * All other signals cause the process to run
-                        */
-                       goto run;
-               }
+               } else
+                       goto runfast;
                /*NOTREACHED*/
 
        case SSTOP:
                /*NOTREACHED*/
 
        case SSTOP:
@@ -474,52 +779,54 @@ psignal(p, sig)
                 * If traced process is already stopped,
                 * then no further action is necessary.
                 */
                 * If traced process is already stopped,
                 * then no further action is necessary.
                 */
-               if (p->p_flag&STRC)
+               if (p->p_flag & P_TRACED)
                        goto out;
                        goto out;
-               switch (sig) {
 
 
-               case SIGKILL:
-                       /*
-                        * Kill signal always sets processes running.
-                        */
-                       goto run;
+               /*
+                * Kill signal always sets processes running.
+                */
+               if (signum == SIGKILL)
+                       goto runfast;
 
 
-               case SIGCONT:
+               if (prop & SA_CONT) {
                        /*
                        /*
-                        * If the process catches SIGCONT, let it handle
-                        * the signal itself.  If it isn't waiting on
+                        * If SIGCONT is default (or ignored), we continue the
+                        * process but don't leave the signal in p_siglist, as
+                        * it has no further action.  If SIGCONT is held, we
+                        * continue the process and leave the signal in
+                        * p_siglist.  If the process catches SIGCONT, let it
+                        * handle the signal itself.  If it isn't waiting on
                         * an event, then it goes back to run state.
                         * Otherwise, process goes back to sleep state.
                         */
                         * an event, then it goes back to run state.
                         * Otherwise, process goes back to sleep state.
                         */
-                       if (action != SIG_DFL || p->p_wchan == 0)
+                       if (action == SIG_DFL)
+                               p->p_siglist &= ~mask;
+                       if (action == SIG_CATCH)
+                               goto runfast;
+                       if (p->p_wchan == 0)
                                goto run;
                        p->p_stat = SSLEEP;
                        goto out;
                                goto run;
                        p->p_stat = SSLEEP;
                        goto out;
+               }
 
 
-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
+               if (prop & SA_STOP) {
                        /*
                         * Already stopped, don't need to stop again.
                         * (If we did the shell could get confused.)
                         */
                        /*
                         * Already stopped, don't need to stop again.
                         * (If we did the shell could get confused.)
                         */
-                       p->p_sig &= ~mask;              /* take it away */
-                       goto out;
-
-               default:
-                       /*
-                        * If process is sleeping interruptibly, then
-                        * unstick it so that when it is continued
-                        * it can look at the signal.
-                        * But don't setrun the process as its not to
-                        * be unstopped by the signal alone.
-                        */
-                       if (p->p_wchan && p->p_pri > PZERO)
-                               unsleep(p);
+                       p->p_siglist &= ~mask;          /* take it away */
                        goto out;
                }
                        goto out;
                }
-               /*NOTREACHED*/
+
+               /*
+                * If process is sleeping interruptibly, then simulate a
+                * wakeup so that when it is continued, it will be made
+                * runnable and can look at the signal.  But don't make
+                * the process runnable, leave it stopped.
+                */
+               if (p->p_wchan && p->p_flag & P_SINTR)
+                       unsleep(p);
+               goto out;
 
        default:
                /*
 
        default:
                /*
@@ -527,317 +834,364 @@ psignal(p, sig)
                 * other than kicking ourselves if we are running.
                 * It will either never be noticed, or noticed very soon.
                 */
                 * other than kicking ourselves if we are running.
                 * It will either never be noticed, or noticed very soon.
                 */
-               if (p == u.u_procp && !noproc)
-                       aston();
+               if (p == curproc)
+                       signotify(p);
                goto out;
        }
        /*NOTREACHED*/
                goto out;
        }
        /*NOTREACHED*/
-run:
+
+runfast:
        /*
         * Raise priority to at least PUSER.
         */
        /*
         * Raise priority to at least PUSER.
         */
-       if (p->p_pri > PUSER)
-               p->p_pri = PUSER;
-       setrun(p);
+       if (p->p_priority > PUSER)
+               p->p_priority = PUSER;
+run:
+       setrunnable(p);
 out:
        splx(s);
 }
 
 /*
 out:
        splx(s);
 }
 
 /*
- * Returns true if the current
- * process has a signal to process.
- * The signal to process is put in p_cursig.
- * This is asked at least once each time a process enters the
- * system (though this can usually be done without actually
- * calling issig by checking the pending signal masks.)
- * A signal does not do anything
- * directly to a process; it sets
- * a flag that asks the process to
- * do something to itself.
+ * If the current process has received a signal (should be caught or cause
+ * termination, should interrupt current syscall), return the signal number.
+ * Stop signals with default action are processed immediately, then cleared;
+ * they aren't returned.  This is checked after each entry to the system for
+ * a syscall or trap (though this can usually be done without calling issignal
+ * by checking the pending signal masks in the CURSIG macro.) The normal call
+ * sequence is
+ *
+ *     while (signum = CURSIG(curproc))
+ *             postsig(signum);
  */
  */
-issig()
-{
+issignal(p)
        register struct proc *p;
        register struct proc *p;
-       register int sig;
-       int sigbits, mask;
+{
+       register int signum, mask, prop;
 
 
-       p = u.u_procp;
        for (;;) {
        for (;;) {
-               sigbits = p->p_sig &~ p->p_sigmask;
-               if ((p->p_flag&STRC) == 0)
-                       sigbits &= ~p->p_sigignore;
-               if (p->p_flag&SVFORK)
-                       sigbits &= ~stopsigmask;
-               if (sigbits == 0)
-                       break;
-               sig = ffs((long)sigbits);
-               mask = sigmask(sig);
-               p->p_sig &= ~mask;              /* take the signal! */
-               p->p_cursig = sig;
-               if (p->p_flag&STRC && (p->p_flag&SVFORK) == 0) {
+               mask = p->p_siglist & ~p->p_sigmask;
+               if (p->p_flag & P_PPWAIT)
+                       mask &= ~stopsigmask;
+               if (mask == 0)          /* no signal to send */
+                       return (0);
+               signum = ffs((long)mask);
+               mask = sigmask(signum);
+               prop = sigprop[signum];
+               /*
+                * We should see pending but ignored signals
+                * only if P_TRACED was on when they were posted.
+                */
+               if (mask & p->p_sigignore && (p->p_flag & P_TRACED) == 0) {
+                       p->p_siglist &= ~mask;
+                       continue;
+               }
+               if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) {
                        /*
                         * If traced, always stop, and stay
                         * stopped until released by the parent.
                         */
                        /*
                         * If traced, always stop, and stay
                         * stopped until released by the parent.
                         */
+                       p->p_xstat = signum;
                        psignal(p->p_pptr, SIGCHLD);
                        do {
                                stop(p);
                        psignal(p->p_pptr, SIGCHLD);
                        do {
                                stop(p);
-                               swtch();
-                       } while (!procxmt() && p->p_flag&STRC);
+                               mi_switch();
+                       } while (!trace_req(p) && p->p_flag & P_TRACED);
 
                        /*
 
                        /*
-                        * If the traced bit got turned off,
-                        * then put the signal taken above back into p_sig
-                        * and go back up to the top to rescan signals.
-                        * This ensures that p_sig* and u_signal are consistent.
+                        * If the traced bit got turned off, go back up
+                        * to the top to rescan signals.  This ensures
+                        * that p_sig* and ps_sigact are consistent.
                         */
                         */
-                       if ((p->p_flag&STRC) == 0) {
-                               p->p_sig |= mask;
+                       if ((p->p_flag & P_TRACED) == 0)
                                continue;
                                continue;
-                       }
 
                        /*
                         * If parent wants us to take the signal,
 
                        /*
                         * If parent wants us to take the signal,
-                        * then it will leave it in p->p_cursig;
+                        * then it will leave it in p->p_xstat;
                         * otherwise we just look for signals again.
                         */
                         * otherwise we just look for signals again.
                         */
-                       sig = p->p_cursig;
-                       if (sig == 0)
+                       p->p_siglist &= ~mask;  /* clear the old signal */
+                       signum = p->p_xstat;
+                       if (signum == 0)
                                continue;
 
                        /*
                                continue;
 
                        /*
-                        * If signal is being masked put it back
-                        * into p_sig and look for other signals.
+                        * Put the new signal into p_siglist.  If the
+                        * signal is being masked, look for other signals.
                         */
                         */
-                       mask = sigmask(sig);
-                       if (p->p_sigmask & mask) {
-                               p->p_sig |= mask;
+                       mask = sigmask(signum);
+                       p->p_siglist |= mask;
+                       if (p->p_sigmask & mask)
                                continue;
                                continue;
-                       }
                }
                }
-               switch ((int)u.u_signal[sig]) {
+
+               /*
+                * Decide whether the signal should be returned.
+                * Return the signal's number, or fall through
+                * to clear it from the pending mask.
+                */
+               switch ((int)p->p_sigacts->ps_sigact[signum]) {
 
                case SIG_DFL:
                        /*
                         * Don't take default actions on system processes.
                         */
 
                case SIG_DFL:
                        /*
                         * Don't take default actions on system processes.
                         */
-                       if (p->p_ppid == 0)
-                               break;
-                       switch (sig) {
-
-                       case SIGTSTP:
-                       case SIGTTIN:
-                       case SIGTTOU:
-                       case SIGSTOP:
-                               if (p->p_flag&STRC)
-                                       continue;
-                               psignal(p->p_pptr, SIGCHLD);
-                               stop(p);
-                               swtch();
-                               continue;
-
-                       case SIGCONT:
-                       case SIGCHLD:
-                       case SIGURG:
-                       case SIGIO:
-                       case SIGWINCH:
+                       if (p->p_pid <= 1) {
+#ifdef DIAGNOSTIC
                                /*
                                /*
-                                * These signals are normally not
-                                * sent if the action is the default.
+                                * Are you sure you want to ignore SIGSEGV
+                                * in init? XXX
                                 */
                                 */
-                               continue;               /* == ignore */
-
-                       default:
-                               goto send;
+                               printf("Process (pid %d) got signal %d\n",
+                                       p->p_pid, signum);
+#endif
+                               break;          /* == ignore */
                        }
                        }
+                       /*
+                        * If there is a pending stop signal to process
+                        * with default action, stop here,
+                        * then clear the signal.  However,
+                        * if process is member of an orphaned
+                        * process group, ignore tty stop signals.
+                        */
+                       if (prop & SA_STOP) {
+                               if (p->p_flag & P_TRACED ||
+                                   (p->p_pgrp->pg_jobc == 0 &&
+                                   prop & SA_TTYSTOP))
+                                       break;  /* == ignore */
+                               p->p_xstat = signum;
+                               stop(p);
+                               if ((p->p_pptr->p_flag & P_NOCLDSTOP) == 0)
+                                       psignal(p->p_pptr, SIGCHLD);
+                               mi_switch();
+                               break;
+                       } else if (prop & SA_IGNORE) {
+                               /*
+                                * Except for SIGCONT, shouldn't get here.
+                                * Default action is to ignore; drop it.
+                                */
+                               break;          /* == ignore */
+                       } else
+                               return (signum);
                        /*NOTREACHED*/
 
                        /*NOTREACHED*/
 
-               case SIG_HOLD:
                case SIG_IGN:
                        /*
                case SIG_IGN:
                        /*
-                        * Masking above should prevent us
-                        * ever trying to take action on a held
-                        * or ignored signal, unless process is traced.
+                        * Masking above should prevent us ever trying
+                        * to take action on an ignored signal other
+                        * than SIGCONT, unless process is traced.
                         */
                         */
-                       if ((p->p_flag&STRC) == 0)
-                               printf("issig\n");
-                       continue;
+                       if ((prop & SA_CONT) == 0 &&
+                           (p->p_flag & P_TRACED) == 0)
+                               printf("issignal\n");
+                       break;          /* == ignore */
 
                default:
                        /*
                         * This signal has an action, let
 
                default:
                        /*
                         * This signal has an action, let
-                        * psig process it.
+                        * postsig() process it.
                         */
                         */
-                       goto send;
+                       return (signum);
                }
                }
-               /*NOTREACHED*/
+               p->p_siglist &= ~mask;          /* take the signal! */
        }
        }
-       /*
-        * Didn't find a signal to send.
-        */
-       p->p_cursig = 0;
-       return (0);
-
-send:
-       /*
-        * Let psig process the signal.
-        */
-       return (sig);
+       /* NOTREACHED */
 }
 
 /*
 }
 
 /*
- * Put the argument process into the stopped
- * state and notify the parent via wakeup.
- * Signals are handled elsewhere.
+ * Put the argument process into the stopped state and notify the parent
+ * via wakeup.  Signals are handled elsewhere.  The process must not be
+ * on the run queue.
  */
 stop(p)
        register struct proc *p;
 {
 
        p->p_stat = SSTOP;
  */
 stop(p)
        register struct proc *p;
 {
 
        p->p_stat = SSTOP;
-       p->p_flag &= ~SWTED;
+       p->p_flag &= ~P_WAITED;
        wakeup((caddr_t)p->p_pptr);
 }
 
 /*
        wakeup((caddr_t)p->p_pptr);
 }
 
 /*
- * Perform the action specified by
- * the current signal.
- * The usual sequence is:
- *     if (issig())
- *             psig();
- * The signal bit has already been cleared by issig,
- * and the current signal number stored in p->p_cursig.
+ * Take the action for the specified signal
+ * from the current set of pending signals.
  */
  */
-psig()
+void
+postsig(signum)
+       register int signum;
 {
 {
-       register struct proc *p = u.u_procp;
-       register int sig = p->p_cursig;
-       int mask = sigmask(sig), returnmask;
-       register int (*action)();
-
-       if (sig == 0)
-               panic("psig");
-       action = u.u_signal[sig];
-       if (action != SIG_DFL) {
+       register struct proc *p = curproc;
+       register struct sigacts *ps = p->p_sigacts;
+       register sig_t action;
+       int code, mask, returnmask;
+
+#ifdef DIAGNOSTIC
+       if (signum == 0)
+               panic("postsig");
+#endif
+       mask = sigmask(signum);
+       p->p_siglist &= ~mask;
+       action = ps->ps_sigact[signum];
+#ifdef KTRACE
+       if (KTRPOINT(p, KTR_PSIG))
+               ktrpsig(p->p_tracep,
+                   signum, action, ps->ps_flags & SAS_OLDMASK ?
+                   ps->ps_oldmask : p->p_sigmask, 0);
+#endif
+       if (action == SIG_DFL) {
+               /*
+                * Default action, where the default is to kill
+                * the process.  (Other cases were ignored above.)
+                */
+               sigexit(p, signum);
+               /* NOTREACHED */
+       } else {
+               /*
+                * If we get here, the signal must be caught.
+                */
+#ifdef DIAGNOSTIC
                if (action == SIG_IGN || (p->p_sigmask & mask))
                if (action == SIG_IGN || (p->p_sigmask & mask))
-                       panic("psig action");
-               u.u_error = 0;
+                       panic("postsig action");
+#endif
                /*
                 * Set the new mask value and also defer further
                /*
                 * Set the new mask value and also defer further
-                * occurences of this signal (unless we're simulating
-                * the old signal facilities). 
+                * occurences of this signal.
                 *
                 * Special case: user has done a sigpause.  Here the
                 * current mask is not of interest, but rather the
                 *
                 * Special case: user has done a sigpause.  Here the
                 * current mask is not of interest, but rather the
-                * mask from before the sigpause is what we want restored
-                * after the signal processing is completed.
+                * mask from before the sigpause is what we want
+                * restored after the signal processing is completed.
                 */
                (void) splhigh();
                 */
                (void) splhigh();
-               if (p->p_flag & SOUSIG) {
-                       if (sig != SIGILL && sig != SIGTRAP) {
-                               u.u_signal[sig] = SIG_DFL;
-                               p->p_sigcatch &= ~mask;
-                       }
-                       mask = 0;
-               }
-               if (p->p_flag & SOMASK) {
-                       returnmask = u.u_oldmask;
-                       p->p_flag &= ~SOMASK;
+               if (ps->ps_flags & SAS_OLDMASK) {
+                       returnmask = ps->ps_oldmask;
+                       ps->ps_flags &= ~SAS_OLDMASK;
                } else
                        returnmask = p->p_sigmask;
                } else
                        returnmask = p->p_sigmask;
-               p->p_sigmask |= u.u_sigmask[sig] | mask;
+               p->p_sigmask |= ps->ps_catchmask[signum] | mask;
                (void) spl0();
                (void) spl0();
-               u.u_ru.ru_nsignals++;
-               sendsig(action, sig, returnmask);
-               p->p_cursig = 0;
-               return;
+               p->p_stats->p_ru.ru_nsignals++;
+               if (ps->ps_sig != signum) {
+                       code = 0;
+               } else {
+                       code = ps->ps_code;
+                       ps->ps_code = 0;
+               }
+               sendsig(action, signum, returnmask, code);
        }
        }
-       u.u_acflag |= AXSIG;
-       switch (sig) {
-
-       case SIGILL:
-       case SIGIOT:
-       case SIGBUS:
-       case SIGQUIT:
-       case SIGTRAP:
-       case SIGEMT:
-       case SIGFPE:
-       case SIGSEGV:
-       case SIGSYS:
-               u.u_arg[0] = sig;
-               if (core() == 0)
-                       sig += 0200;
+}
+
+/*
+ * Kill the current process for stated reason.
+ */
+killproc(p, why)
+       struct proc *p;
+       char *why;
+{
+
+       log(LOG_ERR, "pid %d was killed: %s\n", p->p_pid, why);
+       uprintf("sorry, pid %d was killed: %s\n", p->p_pid, why);
+       psignal(p, SIGKILL);
+}
+
+/*
+ * Force the current process to exit with the specified signal, dumping core
+ * if appropriate.  We bypass the normal tests for masked and caught signals,
+ * allowing unrecoverable failures to terminate the process without changing
+ * signal state.  Mark the accounting record with the signal termination.
+ * If dumping core, save the signal number for the debugger.  Calls exit and
+ * does not return.
+ */
+sigexit(p, signum)
+       register struct proc *p;
+       int signum;
+{
+
+       p->p_acflag |= AXSIG;
+       if (sigprop[signum] & SA_CORE) {
+               p->p_sigacts->ps_sig = signum;
+               if (coredump(p) == 0)
+                       signum |= WCOREFLAG;
        }
        }
-       exit(sig);
+       exit1(p, W_EXITCODE(0, signum));
+       /* NOTREACHED */
 }
 
 /*
 }
 
 /*
- * Create a core image on the file "core"
- * If you are looking for protection glitches,
- * there are probably a wealth of them here
- * when this occurs to a suid command.
- *
- * It writes UPAGES block of the
- * user.h area followed by the entire
- * data+stack segments.
+ * Dump core, into a file named "progname.core", unless the process was
+ * setuid/setgid.
  */
  */
-core()
+coredump(p)
+       register struct proc *p;
 {
 {
-       register struct vnode *vp, *dvp;
-       register struct nameidata *ndp = &u.u_nd;
+       register struct vnode *vp;
+       register struct pcred *pcred = p->p_cred;
+       register struct ucred *cred = pcred->pc_ucred;
+       register struct vmspace *vm = p->p_vmspace;
+       struct nameidata nd;
        struct vattr vattr;
        struct vattr vattr;
-       int error;
+       int error, error1;
+       char name[MAXCOMLEN+6];         /* progname.core */
 
 
-       if (u.u_uid != u.u_ruid || u.u_gid != u.u_rgid)
+       if (pcred->p_svuid != pcred->p_ruid || pcred->p_svgid != pcred->p_rgid)
                return (EFAULT);
                return (EFAULT);
-       if (ctob(UPAGES + u.u_dsize + u.u_ssize) >=
-           u.u_rlimit[RLIMIT_CORE].rlim_cur)
+       if (ctob(UPAGES + vm->vm_dsize + vm->vm_ssize) >=
+           p->p_rlimit[RLIMIT_CORE].rlim_cur)
                return (EFAULT);
                return (EFAULT);
-       if (u.u_procp->p_textp) {
-               vop_lock(u.u_procp->p_textp->x_vptr);
-               error = vn_access(u.u_procp->p_textp->x_vptr, VREAD, u.u_cred);
-               vop_unlock(u.u_procp->p_textp->x_vptr);
-               if (error)
-                       return (EFAULT);
-       }
-       ndp->ni_segflg = UIO_SYSSPACE;
-       ndp->ni_dirp = "core";
-       if (error = vn_open(ndp, FCREAT|FWRITE, 0644))
+       sprintf(name, "%s.core", p->p_comm);
+       NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, name, p);
+       if (error = vn_open(&nd,
+           O_CREAT | FWRITE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH))
                return (error);
                return (error);
-       vp = ndp->ni_vp;
+       vp = nd.ni_vp;
+
+       /* Don't dump to non-regular files or files with links. */
        if (vp->v_type != VREG ||
        if (vp->v_type != VREG ||
-           vop_getattr(vp, &vattr, u.u_cred) ||
-           vattr.va_nlink != 1) {
+           VOP_GETATTR(vp, &vattr, cred, p) || vattr.va_nlink != 1) {
                error = EFAULT;
                goto out;
        }
                error = EFAULT;
                goto out;
        }
-#ifdef MMAP
-       { register int fd;
-       /* unmasp funky devices in the user's address space */
-       for (fd = 0; fd < u.u_lastfile; fd++)
-               if (u.u_ofile[fd] && (u.u_pofile[fd] & UF_MAPPED))
-                       munmapfd(fd);
-       }
-#endif
-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);
        vattr.va_size = 0;
        vattr.va_size = 0;
-       vop_setattr(vp, &vattr, u.u_cred);
-       u.u_acflag |= ACORE;
-       error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&u, ctob(UPAGES), (off_t)0,
-           UIO_SYSSPACE, IO_UNIT, (int *)0);
+       LEASE_CHECK(vp, p, cred, LEASE_WRITE);
+       VOP_SETATTR(vp, &vattr, cred, p);
+       p->p_acflag |= ACORE;
+       bcopy(p, &p->p_addr->u_kproc.kp_proc, sizeof(struct proc));
+       fill_eproc(p, &p->p_addr->u_kproc.kp_eproc);
+       error = cpu_coredump(p, vp, cred);
        if (error == 0)
        if (error == 0)
-               error = vn_rdwr(UIO_WRITE, vp,
-                   (caddr_t)ctob(dptov(u.u_procp, 0)),
-                   (int)ctob(u.u_dsize), (off_t)ctob(UPAGES),
-                   UIO_USERSPACE, IO_UNIT, (int *)0);
+               error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr,
+                   (int)ctob(vm->vm_dsize), (off_t)ctob(UPAGES), UIO_USERSPACE,
+                   IO_NODELOCKED|IO_UNIT, cred, (int *) NULL, p);
        if (error == 0)
                error = vn_rdwr(UIO_WRITE, vp,
        if (error == 0)
                error = vn_rdwr(UIO_WRITE, vp,
-                   (caddr_t)ctob(sptov(u.u_procp, u.u_ssize - 1)),
-                   (int)ctob(u.u_ssize),
-                   (off_t)ctob(UPAGES) + ctob(u.u_dsize),
-                   UIO_USERSPACE, IO_UNIT, (int *)0);
+                   (caddr_t) trunc_page(USRSTACK - ctob(vm->vm_ssize)),
+                   round_page(ctob(vm->vm_ssize)),
+                   (off_t)ctob(UPAGES) + ctob(vm->vm_dsize), UIO_USERSPACE,
+                   IO_NODELOCKED|IO_UNIT, cred, (int *) NULL, p);
 out:
 out:
-       if (vp)
-               vrele(vp);
+       VOP_UNLOCK(vp);
+       error1 = vn_close(vp, FWRITE, cred, p);
+       if (error == 0)
+               error = error1;
        return (error);
 }
        return (error);
 }
+
+/*
+ * Nonexistent system call-- signal process (may want to handle it).
+ * Flag error in case process won't see signal immediately (blocked or ignored).
+ */
+struct nosys_args {
+       int     dummy;
+};
+/* ARGSUSED */
+nosys(p, args, retval)
+       struct proc *p;
+       struct nosys_args *args;
+       int *retval;
+{
+
+       psignal(p, SIGSYS);
+       return (EINVAL);
+}
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.