projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_3_Net_2 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 3a89c2c..3cfdbe8 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,275 +1,652 @@
-/*     kern_sig.c      5.1     82/07/15        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/reg.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/clock.h"
-#include "../h/mtpr.h"
-#include "../h/timeb.h"
-#include "../h/times.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/text.h"
-#include "../h/seg.h"
-#include "../h/pte.h"
-#include "../h/psl.h"
-#include "../h/vm.h"
-#include "../h/vlimit.h"
-#include "../h/acct.h"
-
-ssig()
-{
-       register int (*f)();
-       struct a {
+/*
+ * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * 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  7.35 (Berkeley) 6/28/91
+ */
+
+#define        SIGPROP         /* include signal properties table */
+#include "param.h"
+#include "signalvar.h"
+#include "resourcevar.h"
+#include "namei.h"
+#include "vnode.h"
+#include "proc.h"
+#include "systm.h"
+#include "timeb.h"
+#include "times.h"
+#include "buf.h"
+#include "seg.h"
+#include "acct.h"
+#include "file.h"
+#include "kernel.h"
+#include "wait.h"
+#include "ktrace.h"
+
+#include "machine/cpu.h"
+
+#include "vm/vm.h"
+#include "kinfo_proc.h"
+#include "user.h"              /* for coredump */
+
+/*
+ * Can process p, with pcred pc, send the signal signo to process q?
+ */
+#define CANSIGNAL(p, pc, q, signo) \
+       ((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 || \
+           ((signo) == SIGCONT && (q)->p_session == (p)->p_session))
+
+/* ARGSUSED */
+sigaction(p, uap, retval)
+       struct proc *p;
+       register struct args {
                int     signo;
                int     signo;
-               int     (*fun)();
+               struct  sigaction *nsa;
+               struct  sigaction *osa;
        } *uap;
        } *uap;
-       register struct proc *p = u.u_procp;
-       register a;
-       long sigmask;
-
-       uap = (struct a *)u.u_ap;
-       a = uap->signo & SIGNUMMASK;
-       f = uap->fun;
-       if (a<=0 || a>=NSIG || a==SIGKILL || a==SIGSTOP ||
-           a==SIGCONT && (f == SIG_IGN || f == SIG_HOLD)) {
-               u.u_error = EINVAL;
-               return;
+       int *retval;
+{
+       struct sigaction vec;
+       register struct sigaction *sa;
+       register struct sigacts *ps = p->p_sigacts;
+       register int sig;
+       int bit, error;
+
+       sig = uap->signo;
+       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
+               return (EINVAL);
+       sa = &vec;
+       if (uap->osa) {
+               sa->sa_handler = ps->ps_sigact[sig];
+               sa->sa_mask = ps->ps_catchmask[sig];
+               bit = sigmask(sig);
+               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 & SNOCLDSTOP)
+                       sa->sa_flags |= SA_NOCLDSTOP;
+               if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
+                   sizeof (vec)))
+                       return (error);
        }
        }
-       if ((uap->signo &~ SIGNUMMASK) || (f != SIG_DFL && f != SIG_IGN &&
-           SIGISDEFER(f)))
-               u.u_procp->p_flag |= SNUSIG;
-       /* 
-        * Don't clobber registers if we are to simulate
-        * a ret+rti.
-        */
-       if ((uap->signo&SIGDORTI) == 0)
-               u.u_r.r_val1 = (int)u.u_signal[a];
+       if (uap->nsa) {
+               if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
+                   sizeof (vec)))
+                       return (error);
+               setsigvec(p, sig, sa);
+       }
+       return (0);
+}
+
+setsigvec(p, sig, sa)
+       register struct proc *p;
+       int sig;
+       register struct sigaction *sa;
+{
+       register struct sigacts *ps = p->p_sigacts;
+       register int bit;
+
+       bit = sigmask(sig);
        /*
         * Change setting atomically.
         */
        /*
         * Change setting atomically.
         */
-       (void) spl6();
-       sigmask = 1L << (a-1);
-       if (u.u_signal[a] == SIG_IGN)
-               p->p_sig &= ~sigmask;           /* never to be seen again */
-       u.u_signal[a] = f;
-       if (f != SIG_DFL && f != SIG_IGN && f != SIG_HOLD)
-               f = SIG_CATCH;
-       if ((int)f & 1)
-               p->p_siga0 |= sigmask;
+       (void) splhigh();
+       ps->ps_sigact[sig] = sa->sa_handler;
+       ps->ps_catchmask[sig] = sa->sa_mask &~ sigcantmask;
+       if ((sa->sa_flags & SA_RESTART) == 0)
+               ps->ps_sigintr |= bit;
        else
        else
-               p->p_siga0 &= ~sigmask;
-       if ((int)f & 2)
-               p->p_siga1 |= sigmask;
+               ps->ps_sigintr &= ~bit;
+       if (sa->sa_flags & SA_ONSTACK)
+               ps->ps_sigonstack |= bit;
        else
        else
-               p->p_siga1 &= ~sigmask;
+               ps->ps_sigonstack &= ~bit;
+       if (sig == SIGCHLD) {
+               if (sa->sa_flags & SA_NOCLDSTOP)
+                       p->p_flag |= SNOCLDSTOP;
+               else
+                       p->p_flag &= ~SNOCLDSTOP;
+       }
+       /*
+        * 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[sig] & SA_IGNORE && sa->sa_handler == SIG_DFL)) {
+               p->p_sig &= ~bit;               /* never to be seen again */
+               if (sig != SIGCONT)
+                       p->p_sigignore |= bit;  /* easier in psignal */
+               p->p_sigcatch &= ~bit;
+       } else {
+               p->p_sigignore &= ~bit;
+               if (sa->sa_handler == SIG_DFL)
+                       p->p_sigcatch &= ~bit;
+               else
+                       p->p_sigcatch |= bit;
+       }
        (void) spl0();
        (void) spl0();
+}
+
+/*
+ * Initialize signal state for process 0;
+ * set to ignore signals that are ignored by default.
+ */
+void
+siginit(p)
+       struct proc *p;
+{
+       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;
+
        /*
        /*
-        * Now handle options.
+        * Reset caught signals.  Held signals remain held
+        * through p_sigmask (unless they were caught,
+        * and are now ignored by default).
         */
         */
-       if (uap->signo & SIGDOPAUSE) {
-               /*
-                * Simulate a PDP11 style wait instrution which
-                * atomically lowers priority, enables interrupts
-                * and hangs.
-                */
-               pause();
-               /*NOTREACHED*/
+       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_sig &= ~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_onstack = 0;
+       ps->ps_sigsp = 0;
+       ps->ps_sigonstack = 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.
+ */
+sigprocmask(p, uap, retval)
+       register struct proc *p;
+       struct args {
+               int     how;
+               sigset_t mask;
+       } *uap;
+       int *retval;
+{
+       int error = 0;
+
+       *retval = p->p_sigmask;
+       (void) splhigh();
+
+       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();
+       return (error);
+}
+
+/* ARGSUSED */
+sigpending(p, uap, retval)
+       struct proc *p;
+       void *uap;
+       int *retval;
+{
+
+       *retval = p->p_sig;
+       return (0);
+}
+
+#ifdef COMPAT_43
+/*
+ * Generalized interface signal handler, 4.3-compatible.
+ */
+/* ARGSUSED */
+osigvec(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     signo;
+               struct  sigvec *nsv;
+               struct  sigvec *osv;
+       } *uap;
+       int *retval;
+{
+       struct sigvec vec;
+       register struct sigacts *ps = p->p_sigacts;
+       register struct sigvec *sv;
+       register int sig;
+       int bit, error;
+
+       sig = uap->signo;
+       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
+               return (EINVAL);
+       sv = &vec;
+       if (uap->osv) {
+               *(sig_t *)&sv->sv_handler = ps->ps_sigact[sig];
+               sv->sv_mask = ps->ps_catchmask[sig];
+               bit = sigmask(sig);
+               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;
+               if (p->p_flag & SNOCLDSTOP)
+                       sv->sv_flags |= SA_NOCLDSTOP;
+               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);
+               sv->sv_flags ^= SA_RESTART;     /* opposite of SV_INTERRUPT */
+               setsigvec(p, sig, (struct sigaction *)sv);
        }
        }
-       if (uap->signo & SIGDORTI)
-               u.u_eosys = SIMULATERTI;
+       return (0);
 }
 
 }
 
-kill()
+osigblock(p, uap, retval)
+       register struct proc *p;
+       struct args {
+               int     mask;
+       } *uap;
+       int *retval;
 {
 {
+
+       (void) splhigh();
+       *retval = p->p_sigmask;
+       p->p_sigmask |= uap->mask &~ sigcantmask;
+       (void) spl0();
+       return (0);
+}
+
+osigsetmask(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     mask;
+       } *uap;
+       int *retval;
+{
+
+       (void) splhigh();
+       *retval = p->p_sigmask;
+       p->p_sigmask = uap->mask &~ sigcantmask;
+       (void) spl0();
+       return (0);
+}
+#endif
+
+/*
+ * 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.
+ */
+/* ARGSUSED */
+sigsuspend(p, uap, retval)
        register struct proc *p;
        register struct proc *p;
-       register a, sig;
-       register struct a {
+       struct args {
+               sigset_t mask;
+       } *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
+        * save it here and mark the proc structure
+        * to indicate this (should be in sigacts).
+        */
+       ps->ps_oldmask = p->p_sigmask;
+       ps->ps_flags |= SA_OLDMASK;
+       p->p_sigmask = uap->mask &~ sigcantmask;
+       (void) tsleep((caddr_t) ps, PPAUSE|PCATCH, "pause", 0);
+       /* always return EINTR rather than ERESTART... */
+       return (EINTR);
+}
+
+/* ARGSUSED */
+sigstack(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               struct  sigstack *nss;
+               struct  sigstack *oss;
+       } *uap;
+       int *retval;
+{
+       struct sigstack ss;
+       int error = 0;
+
+       if (uap->oss && (error = copyout((caddr_t)&p->p_sigacts->ps_sigstack,
+           (caddr_t)uap->oss, sizeof (struct sigstack))))
+               return (error);
+       if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
+           sizeof (ss))) == 0)
+               p->p_sigacts->ps_sigstack = ss;
+       return (error);
+}
+
+/* ARGSUSED */
+kill(cp, uap, retval)
+       register struct proc *cp;
+       register struct args {
                int     pid;
                int     signo;
        } *uap;
                int     pid;
                int     signo;
        } *uap;
-       int f, priv;
+       int *retval;
+{
+       register struct proc *p;
+       register struct pcred *pc = cp->p_cred;
 
 
-       uap = (struct a *)u.u_ap;
-       f = 0;
-       a = uap->pid;
-       priv = 0;
-       sig = uap->signo;
-       if (sig < 0)
-               /*
-                * A negative signal means send to process group.
-                */
-               uap->signo = -uap->signo;
-       if (uap->signo == 0 || uap->signo > NSIG) {
-               u.u_error = EINVAL;
-               return;
+       if ((unsigned) uap->signo >= NSIG)
+               return (EINVAL);
+       if (uap->pid > 0) {
+               /* kill single process */
+               p = pfind(uap->pid);
+               if (p == 0)
+                       return (ESRCH);
+               if (!CANSIGNAL(cp, pc, p, uap->signo))
+                       return (EPERM);
+               if (uap->signo)
+                       psignal(p, uap->signo);
+               return (0);
        }
        }
-       if (a > 0 && sig > 0) {
-               p = pfind(a);
-               if (p == 0 || u.u_uid && u.u_uid != p->p_uid) {
-                       u.u_error = ESRCH;
-                       return;
-               }
-               psignal(p, uap->signo);
-               return;
+       switch (uap->pid) {
+       case -1:                /* broadcast signal */
+               return (killpg1(cp, uap->signo, 0, 1));
+       case 0:                 /* signal own process group */
+               return (killpg1(cp, uap->signo, 0, 0));
+       default:                /* negative explicit process group */
+               return (killpg1(cp, uap->signo, -uap->pid, 0));
        }
        }
-       if (a==-1 && u.u_uid==0) {
-               priv++;
-               a = 0;
-               sig = -1;               /* like sending to pgrp */
-       } else if (a==0) {
-               /*
-                * Zero process id means send to my process group.
+       /* NOTREACHED */
+}
+
+#ifdef COMPAT_43
+/* ARGSUSED */
+okillpg(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     pgid;
+               int     signo;
+       } *uap;
+       int *retval;
+{
+
+       if ((unsigned) uap->signo >= NSIG)
+               return (EINVAL);
+       return (killpg1(p, uap->signo, uap->pgid, 0));
+}
+#endif
+
+/*
+ * Common code for kill process group/broadcast kill.
+ * cp is calling process.
+ */
+killpg1(cp, signo, pgid, all)
+       register struct proc *cp;
+       int signo, pgid, all;
+{
+       register struct proc *p;
+       register struct pcred *pc = cp->p_cred;
+       struct pgrp *pgrp;
+       int nfound = 0;
+       
+       if (all)        
+               /* 
+                * broadcast 
                 */
                 */
-               sig = -1;
-               a = u.u_procp->p_pgrp;
-               if (a == 0) {
-                       u.u_error = EINVAL;
-                       return;
+               for (p = allproc; p != NULL; p = p->p_nxt) {
+                       if (p->p_pid <= 1 || p->p_flag&SSYS || 
+                           p == cp || !CANSIGNAL(cp, pc, p, signo))
+                               continue;
+                       nfound++;
+                       if (signo)
+                               psignal(p, signo);
                }
                }
-       }
-       for(p = proc; p < procNPROC; p++) {
-               if (p->p_stat == NULL)
-                       continue;
-               if (sig > 0) {
-                       if (p->p_pid != a)
+       else {
+               if (pgid == 0)          
+                       /* 
+                        * zero pgid means send to my process group.
+                        */
+                       pgrp = cp->p_pgrp;
+               else {
+                       pgrp = pgfind(pgid);
+                       if (pgrp == NULL)
+                               return (ESRCH);
+               }
+               for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
+                       if (p->p_pid <= 1 || p->p_flag&SSYS ||
+                           p->p_stat == SZOMB || !CANSIGNAL(cp, pc, p, signo))
                                continue;
                                continue;
-               } else if (p->p_pgrp!=a && priv==0 || p->p_ppid==0 ||
-                   (p->p_flag&SSYS) || (priv && p==u.u_procp))
-                       continue;
-               if (u.u_uid != 0 && u.u_uid != p->p_uid &&
-                   (uap->signo != SIGCONT || !inferior(p)))
-                       continue;
-               f++;
-               psignal(p, uap->signo);
+                       nfound++;
+                       if (signo)
+                               psignal(p, signo);
+               }
        }
        }
-       if (f == 0)
-               u.u_error = ESRCH;
+       return (nfound ? 0 : ESRCH);
 }
 
 /*
 }
 
 /*
- * Priority for tracing
+ * Send the specified signal to
+ * all processes with 'pgid' as
+ * process group.
  */
  */
-#define        IPCPRI  PZERO
+void
+gsignal(pgid, sig)
+       int pgid, sig;
+{
+       struct pgrp *pgrp;
+
+       if (pgid && (pgrp = pgfind(pgid)))
+               pgsignal(pgrp, sig, 0);
+}
 
 /*
 
 /*
- * Tracing variables.
- * Used to pass trace command from
- * parent to child being traced.
- * This data base cannot be
- * shared and is locked
- * per user.
+ * Send sig to every member of a process group.
+ * If checktty is 1, limit to members which have a controlling
+ * terminal.
  */
  */
-struct {
-       int     ip_lock;
-       int     ip_req;
-       int     *ip_addr;
-       int     ip_data;
-} ipc;
+void
+pgsignal(pgrp, sig, checkctty)
+       struct pgrp *pgrp;
+       int sig, checkctty;
+{
+       register struct proc *p;
+
+       if (pgrp)
+               for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt)
+                       if (checkctty == 0 || p->p_flag&SCTTY)
+                               psignal(p, sig);
+}
 
 /*
 
 /*
- * Send the specified signal to
- * all processes with 'pgrp' as
- * process group.
- * Called by tty.c for quits and
- * interrupts.
+ * 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.
  */
  */
-gsignal(pgrp, sig)
-       register int pgrp;
+void
+trapsignal(p, sig, code)
+       struct proc *p;
+       register int sig;
+       unsigned code;
 {
 {
-       register struct proc *p;
+       register struct sigacts *ps = p->p_sigacts;
+       int mask;
 
 
-       if (pgrp == 0)
-               return;
-       for(p = proc; p < procNPROC; p++)
-               if (p->p_pgrp == pgrp)
-                       psignal(p, sig);
+       mask = sigmask(sig);
+       if ((p->p_flag & STRC) == 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, sig, ps->ps_sigact[sig], 
+                               p->p_sigmask, code);
+#endif
+               sendsig(ps->ps_sigact[sig], sig, p->p_sigmask, code);
+               p->p_sigmask |= ps->ps_catchmask[sig] | mask;
+       } else {
+               ps->ps_code = code;     /* XXX for core dump/debugger */
+               psignal(p, sig);
+       }
 }
 
 /*
 }
 
 /*
- * Send the specified signal to
- * the specified process.
+ * Send the specified signal to the specified process.
+ * If the signal has an action, the action is usually performed
+ * by the target process rather than the caller; we simply 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, sig)
        register struct proc *p;
        register int sig;
 {
 psignal(p, sig)
        register struct proc *p;
        register int sig;
 {
-       register int s;
-       register int (*action)();
-       long sigmask;
+       register int s, prop;
+       register sig_t action;
+       int mask;
 
 
-       if ((unsigned)sig >= NSIG)
-               return;
-       sigmask = (1L << (sig-1));
+       if ((unsigned)sig >= NSIG || sig == 0)
+               panic("psignal sig");
+       mask = sigmask(sig);
+       prop = sigprop[sig];
 
        /*
         * If proc is traced, always give parent a chance.
 
        /*
         * If proc is traced, always give parent a chance.
-        * Otherwise get the signal action from the bits in the proc table.
         */
        if (p->p_flag & STRC)
                action = SIG_DFL;
        else {
         */
        if (p->p_flag & STRC)
                action = SIG_DFL;
        else {
-               s = (p->p_siga1&sigmask) != 0;
-               s <<= 1;
-               s |= (p->p_siga0&sigmask) != 0;
-               action = (int(*)())s;
                /*
                /*
-                * If the signal is ignored, we forget about it immediately.
+                * 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 (action == SIG_IGN)
+               if (p->p_sigignore & mask)
                        return;
                        return;
+               if (p->p_sigmask & mask)
+                       action = SIG_HOLD;
+               else if (p->p_sigcatch & mask)
+                       action = SIG_CATCH;
+               else
+                       action = SIG_DFL;
        }
        }
-#define mask(sig)      (1<<(sig-1))
-#define        stops   (mask(SIGSTOP)|mask(SIGTSTP)|mask(SIGTTIN)|mask(SIGTTOU))
-       if (sig) {
-               p->p_sig |= sigmask;
-               switch (sig) {
-
-               case SIGTERM:
-                       if ((p->p_flag&STRC) != 0 || action != SIG_DFL)
-                               break;
-                       /* fall into ... */
-
-               case SIGKILL:
-                       if (p->p_nice > NZERO)
-                               p->p_nice = NZERO;
-                       break;
-
-               case SIGCONT:
-                       p->p_sig &= ~stops;
-                       break;
-
-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       p->p_sig &= ~mask(SIGCONT);
-                       break;
-               }
+
+       if (p->p_nice > NZERO && (sig == SIGKILL ||
+           sig == SIGTERM && (p->p_flag&STRC || action != SIG_DFL)))
+               p->p_nice = NZERO;
+
+       if (prop & SA_CONT)
+               p->p_sig &= ~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_sig &= ~contsigmask;
        }
        }
-#undef mask
-#undef stops
+       p->p_sig |= 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;
                return;
-       s = spl6();
+       s = splhigh();
        switch (p->p_stat) {
 
        case SSLEEP:
                /*
        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 & SSINTR) == 0)
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
@@ -278,58 +655,29 @@ psignal(p, sig)
                 */
                if (p->p_flag&STRC)
                        goto run;
                 */
                if (p->p_flag&STRC)
                        goto run;
-               switch (sig) {
-
-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       /*
-                        * These are the signals which by default
-                        * stop a process.
-                        */
+               /*
+                * 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;
-                       /*
-                        * Don't clog system with children of init
-                        * stopped from the keyboard.
-                        */
-                       if (sig != SIGSTOP && p->p_pptr == &proc[1]) {
-                               psignal(p, SIGKILL);
-                               p->p_sig &= ~sigmask;
-                               splx(s);
-                               return;
-                       }
+                               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&SPPWAIT)
                                goto out;
                                goto out;
-                       p->p_sig &= ~sigmask;
-                       p->p_cursig = sig;
+                       p->p_sig &= ~mask;
+                       p->p_xstat = sig;
+                       if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
+                               psignal(p->p_pptr, SIGCHLD);
                        stop(p);
                        goto out;
                        stop(p);
                        goto out;
-
-               case SIGIO:
-               case SIGURG:
-               case SIGCHLD:
-                       /*
-                        * 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 &= ~sigmask;           /* 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:
@@ -339,50 +687,52 @@ psignal(p, sig)
                 */
                if (p->p_flag&STRC)
                        goto out;
                 */
                if (p->p_flag&STRC)
                        goto out;
-               switch (sig) {
 
 
-               case SIGKILL:
-                       /*
-                        * Kill signal always sets processes running.
-                        */
-                       goto run;
+               /*
+                * Kill signal always sets processes running.
+                */
+               if (sig == SIGKILL)
+                       goto runfast;
 
 
-               case SIGCONT:
+               if (prop & SA_CONT) {
                        /*
                        /*
+                        * If SIGCONT is default (or ignored), we continue
+                        * the process but don't leave the signal in p_sig,
+                        * as it has no further action.  If SIGCONT is held,
+                        * continue the process and leave the signal in p_sig.
                         * 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.
                         */
                         * 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.
                         */
-                       if (action != SIG_DFL || p->p_wchan == 0)
+                       if (action == SIG_DFL)
+                               p->p_sig &= ~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 &= ~sigmask;           /* 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_sig &= ~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 setrun the process, leave it stopped.
+                */
+               if (p->p_wchan && p->p_flag & SSINTR)
+                       unsleep(p);
+               goto out;
 
        default:
                /*
 
        default:
                /*
@@ -390,185 +740,169 @@ 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.
         */
        if (p->p_pri > PUSER)
        /*
         * Raise priority to at least PUSER.
         */
        if (p->p_pri > PUSER)
-               if ((p != u.u_procp || noproc) && p->p_stat == SRUN &&
-                   (p->p_flag & SLOAD)) {
-                       remrq(p);
-                       p->p_pri = PUSER;
-                       setrq(p);
-               } else
-                       p->p_pri = PUSER;
+               p->p_pri = PUSER;
+run:
        setrun(p);
 out:
        splx(s);
 }
 
 /*
        setrun(p);
 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 a signal to process (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 actually calling
+ * issig by checking the pending signal masks in the CURSIG macro.)
+ * The normal call sequence is
+ *
+ *     while (sig = CURSIG(curproc))
+ *             psig(sig);
  */
  */
-issig()
-{
+issig(p)
        register struct proc *p;
        register struct proc *p;
-       register int sig;
-       long sigbits;
-       long sigmask;
+{
+       register int sig, mask, prop;
 
 
-       p = u.u_procp;
        for (;;) {
        for (;;) {
-               sigbits = p->p_sig;
-               if ((p->p_flag&STRC) == 0)
-                       sigbits &= ~p->p_ignsig;
-               if (p->p_flag&SVFORK)
-#define bit(a) (1<<(a-1))
-                       sigbits &= ~(bit(SIGSTOP)|bit(SIGTSTP)|bit(SIGTTIN)|bit(SIGTTOU));
-               if (sigbits == 0)
-                       break;
-               sig = ffs((int)sigbits);
-               sigmask = 1L << (sig-1);
-               p->p_sig &= ~sigmask;           /* take the signal! */
-               p->p_cursig = sig;
-               if (p->p_flag&STRC && (p->p_flag&SVFORK)==0) {
+               mask = p->p_sig &~ p->p_sigmask;
+               if (p->p_flag&SPPWAIT)
+                       mask &= ~stopsigmask;
+               if (mask == 0)          /* no signal to send */
+                       return (0);
+               sig = ffs((long)mask);
+               mask = sigmask(sig);
+               prop = sigprop[sig];
+               /*
+                * We should see pending but ignored signals
+                * only if STRC was on when they were posted.
+                */
+               if (mask & p->p_sigignore && (p->p_flag&STRC) == 0) {
+                       p->p_sig &= ~mask;
+                       continue;
+               }
+               if (p->p_flag&STRC && (p->p_flag&SPPWAIT) == 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 = sig;
+                       psignal(p->p_pptr, SIGCHLD);
                        do {
                                stop(p);
                                swtch();
                        do {
                                stop(p);
                                swtch();
-                       } while (!procxmt() && p->p_flag&STRC);
+                       } while (!procxmt(p) && p->p_flag&STRC);
 
                        /*
                         * If the traced bit got turned off,
 
                        /*
                         * 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 siga0 and u_signal are consistent.
+                        * 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 |= sigmask;
+                       if ((p->p_flag&STRC) == 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;
+                       p->p_sig &= ~mask;      /* clear the old signal */
+                       sig = p->p_xstat;
                        if (sig == 0)
                                continue;
                        if (sig == 0)
                                continue;
+
+                       /*
+                        * Put the new signal into p_sig.
+                        * If signal is being masked,
+                        * look for other signals.
+                        */
+                       mask = sigmask(sig);
+                       p->p_sig |= mask;
+                       if (p->p_sigmask & mask)
+                               continue;
                }
                }
-               switch (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[sig]) {
 
                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:
-                               /*
-                                * Children of init aren't allowed to stop
-                                * on signals from the keyboard.
-                                */
-                               if (p->p_pptr == &proc[1]) {
-                                       psignal(p, SIGKILL);
-                                       continue;
-                               }
-                               /* fall into ... */
-
-                       case SIGSTOP:
-                               if (p->p_flag&STRC)
-                                       continue;
+                       if (p->p_pid <= 1)
+                               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&STRC ||
+                                   (p->p_pgrp->pg_jobc == 0 &&
+                                   prop & SA_TTYSTOP))
+                                       break;  /* == ignore */
+                               p->p_xstat = sig;
                                stop(p);
                                stop(p);
+                               if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
+                                       psignal(p->p_pptr, SIGCHLD);
                                swtch();
                                swtch();
-                               continue;
-
-                       case SIGCONT:
-                       case SIGCHLD:
+                               break;
+                       } else if (prop & SA_IGNORE) {
                                /*
                                /*
-                                * These signals are normally not
-                                * sent if the action is the default.
+                                * Except for SIGCONT, shouldn't get here.
+                                * Default action is to ignore; drop it.
                                 */
                                 */
-                               continue;               /* == ignore */
-
-                       default:
-                               goto send;
-                       }
+                               break;          /* == ignore */
+                       } else
+                               return (sig);
                        /*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)
+                       if ((prop & SA_CONT) == 0 && (p->p_flag&STRC) == 0)
                                printf("issig\n");
                                printf("issig\n");
-                       continue;
+                       break;          /* == ignore */
 
                default:
                        /*
                         * This signal has an action, let
                         * psig process it.
                         */
 
                default:
                        /*
                         * This signal has an action, let
                         * psig process it.
                         */
-                       goto send;
+                       return (sig);
                }
                }
-               /*NOTREACHED*/
-       }
-       /*
-        * Didn't find a signal to send.
-        */
-       p->p_cursig = 0;
-       return (0);
-
-send:
-       /*
-        * Let psig process the signal.
-        */
-       return (sig);
-}
-
-#ifndef vax
-ffs(mask)
-       register long mask;
-{
-       register int i;
-
-       for(i=1; i<NSIG; i++) {
-               if (mask & 1)
-                       return (i);
-               mask >>= 1;
+               p->p_sig &= ~mask;              /* take the signal! */
        }
        }
-       return (0);
+       /* NOTREACHED */
 }
 }
-#endif
 
 /*
  * Put the argument process into the stopped
 
 /*
  * Put the argument process into the stopped
- * state and notify the parent via wakeup and/or signal.
+ * 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;
  */
 stop(p)
        register struct proc *p;
@@ -577,323 +911,176 @@ stop(p)
        p->p_stat = SSTOP;
        p->p_flag &= ~SWTED;
        wakeup((caddr_t)p->p_pptr);
        p->p_stat = SSTOP;
        p->p_flag &= ~SWTED;
        wakeup((caddr_t)p->p_pptr);
-       /*
-        * Avoid sending signal to parent if process is traced
-        */
-       if (p->p_flag&STRC)
-               return;
-       psignal(p->p_pptr, SIGCHLD);
 }
 
 /*
 }
 
 /*
- * 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
+psig(sig)
+       register int sig;
 {
 {
-       register struct proc *rp = u.u_procp;
-       register int n = rp->p_cursig;
-       long sigmask = 1L << (n-1);
-       register int (*action)();
+       register struct proc *p = curproc;
+       register struct sigacts *ps = p->p_sigacts;
+       register sig_t action;
+       int mask, returnmask;
 
 
-       if (rp->p_cursig == 0)
+#ifdef DIAGNOSTIC
+       if (sig == 0)
                panic("psig");
                panic("psig");
-       action = u.u_signal[n];
-       if (action != SIG_DFL) {
-               if (action == SIG_IGN || action == SIG_HOLD)
-                       panic("psig action");
-               u.u_error = 0;
-               if (n != SIGILL && n != SIGTRAP)
-                       u.u_signal[n] = 0;
+#endif
+       mask = sigmask(sig);
+       p->p_sig &= ~mask;
+       action = ps->ps_sigact[sig];
+#ifdef KTRACE
+       if (KTRPOINT(p, KTR_PSIG))
+               ktrpsig(p->p_tracep, sig, action, ps->ps_flags & SA_OLDMASK ?
+                   ps->ps_oldmask : p->p_sigmask, 0);
+#endif
+       if (action == SIG_DFL) {
                /*
                /*
-                * If this catch value indicates automatic holding of
-                * subsequent signals, set the hold value.
+                * Default action, where the default is to kill
+                * the process.  (Other cases were ignored above.)
                 */
                 */
-               if (SIGISDEFER(action)) {
-                       (void) spl6();
-                       if ((int)SIG_HOLD & 1)
-                               rp->p_siga0 |= sigmask;
-                       else
-                               rp->p_siga0 &= ~sigmask;
-                       if ((int)SIG_HOLD & 2)
-                               rp->p_siga1 |= sigmask;
-                       else
-                               rp->p_siga1 &= ~sigmask;
-                       u.u_signal[n] = SIG_HOLD;
-                       (void) spl0();
-                       action = SIGUNDEFER(action);
-               }
-               sendsig(action, n);
-               rp->p_cursig = 0;
-               return;
-       }
-       u.u_acflag |= AXSIG;
-       switch (n) {
-
-       case SIGILL:
-       case SIGIOT:
-       case SIGBUS:
-       case SIGQUIT:
-       case SIGTRAP:
-       case SIGEMT:
-       case SIGFPE:
-       case SIGSEGV:
-       case SIGSYS:
-               u.u_arg[0] = n;
-               if (core())
-                       n += 0200;
-       }
-       exit(n);
-}
-
-#ifdef unneeded
-int    corestop = 0;
-#endif
-/*
- * 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.
- */
-core()
-{
-       register struct inode *ip;
-       extern schar();
-
-#ifdef unneeded
-       if (corestop) {
-               int i;
-               for (i = 0; i < 10; i++)
-                       if (u.u_comm[i])
-                               putchar(u.u_comm[i], 0);
-               printf(", uid %d\n", u.u_uid);
-               if (corestop&2)
-                       asm("halt");
-       }
+               sigexit(p, sig);
+               /* NOTREACHED */
+       } else {
+               /*
+                * If we get here, the signal must be caught.
+                */
+#ifdef DIAGNOSTIC
+               if (action == SIG_IGN || (p->p_sigmask & mask))
+                       panic("psig action");
 #endif
 #endif
-       if (u.u_uid != u.u_ruid)
-               return;
-       if (ctob(UPAGES+u.u_dsize+u.u_ssize) >= u.u_limit[LIM_CORE])
-               return (0);
-       u.u_error = 0;
-       u.u_dirp = "core";
-       ip = namei(schar, 1, 1);
-       if (ip == NULL) {
-               if (u.u_error)
-                       return (0);
-               ip = maknode(0666);
-               if (ip==NULL)
-                       return (0);
+               /*
+                * Set the new mask value and also defer further
+                * occurences of this signal.
+                *
+                * 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.
+                */
+               (void) splhigh();
+               if (ps->ps_flags & SA_OLDMASK) {
+                       returnmask = ps->ps_oldmask;
+                       ps->ps_flags &= ~SA_OLDMASK;
+               } else
+                       returnmask = p->p_sigmask;
+               p->p_sigmask |= ps->ps_catchmask[sig] | mask;
+               (void) spl0();
+               p->p_stats->p_ru.ru_nsignals++;
+               sendsig(action, sig, returnmask, 0);
        }
        }
-       if (!access(ip, IWRITE) &&
-          (ip->i_mode&IFMT) == IFREG &&
-          ip->i_nlink == 1) {
-               itrunc(ip);
-               u.u_acflag |= ACORE;
-               u.u_offset = 0;
-               u.u_base = (caddr_t)&u;
-               u.u_count = ctob(UPAGES);
-               u.u_segflg = 1;
-               writei(ip);
-               u.u_base = (char *)ctob(u.u_tsize);
-               u.u_count = ctob(u.u_dsize);
-               u.u_segflg = 0;
-               writei(ip);
-               u.u_base = (char *)(USRSTACK - ctob(u.u_ssize));
-               u.u_count = ctob(u.u_ssize);
-               writei(ip);
-       } else
-               u.u_error = EFAULT;
-       iput(ip);
-       return (u.u_error==0);
 }
 
 /*
 }
 
 /*
- * grow the stack to include the SP
- * true return if successful.
+ * 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.
  */
  */
-grow(sp)
-       unsigned sp;
+sigexit(p, sig)
+       register struct proc *p;
+       int sig;
 {
 {
-       register si;
 
 
-       if (sp >= USRSTACK-ctob(u.u_ssize))
-               return (0);
-       si = clrnd(btoc((USRSTACK-sp)) - u.u_ssize + SINCR);
-       if (ctob(u.u_ssize+si) > u.u_limit[LIM_STACK])
-               return (0);
-       if (chksize(u.u_tsize, u.u_dsize, u.u_ssize+si))
-               return (0);
-       if (swpexpand(u.u_dsize, u.u_ssize+si, &u.u_dmap, &u.u_smap)==0)
-               return (0);
-       
-       expand(si, P1BR);
-       return (1);
+       p->p_acflag |= AXSIG;
+       if (sigprop[sig] & SA_CORE) {
+               p->p_sigacts->ps_sig = sig;
+               if (coredump(p) == 0)
+                       sig |= WCOREFLAG;
+       }
+       exit(p, W_EXITCODE(0, sig));
+       /* NOTREACHED */
 }
 
 /*
 }
 
 /*
- * sys-trace system call.
+ * Create a core dump.
+ * The file name is "core.progname".
+ * Core dumps are not created if the process is setuid.
  */
  */
-ptrace()
-{
+coredump(p)
        register struct proc *p;
        register struct proc *p;
-       register struct a {
-               int     req;
-               int     pid;
-               int     *addr;
-               int     data;
-       } *uap;
+{
+       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 vattr vattr;
+       int error, error1;
+       struct nameidata nd;
+       char name[MAXCOMLEN+6]; /* core.progname */
 
 
-       uap = (struct a *)u.u_ap;
-       if (uap->req <= 0) {
-               u.u_procp->p_flag |= STRC;
-               return;
-       }
-       p = pfind(uap->pid);
-       if (p == 0 || p->p_stat != SSTOP || p->p_ppid != u.u_procp->p_pid) {
-               u.u_error = ESRCH;
-               return;
-       }
-       while (ipc.ip_lock)
-               sleep((caddr_t)&ipc, IPCPRI);
-       ipc.ip_lock = p->p_pid;
-       ipc.ip_data = uap->data;
-       ipc.ip_addr = uap->addr;
-       ipc.ip_req = uap->req;
-       p->p_flag &= ~SWTED;
-       while (ipc.ip_req > 0) {
-               if (p->p_stat==SSTOP)
-                       setrun(p);
-               sleep((caddr_t)&ipc, IPCPRI);
+       if (pcred->p_svuid != pcred->p_ruid ||
+           pcred->p_svgid != pcred->p_rgid)
+               return (EFAULT);
+       if (ctob(UPAGES + vm->vm_dsize + vm->vm_ssize) >=
+           p->p_rlimit[RLIMIT_CORE].rlim_cur)
+               return (EFAULT);
+       sprintf(name, "core.%s", p->p_comm);
+       nd.ni_dirp = name;
+       nd.ni_segflg = UIO_SYSSPACE;
+       if (error = vn_open(&nd, p, O_CREAT|FWRITE, 0644))
+               return (error);
+       vp = nd.ni_vp;
+       if (vp->v_type != VREG || VOP_GETATTR(vp, &vattr, cred, p) ||
+           vattr.va_nlink != 1) {
+               error = EFAULT;
+               goto out;
        }
        }
-       u.u_r.r_val1 = ipc.ip_data;
-       if (ipc.ip_req < 0)
-               u.u_error = EIO;
-       ipc.ip_lock = 0;
-       wakeup((caddr_t)&ipc);
+       VATTR_NULL(&vattr);
+       vattr.va_size = 0;
+       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);
+#ifdef HPUXCOMPAT
+       /*
+        * BLETCH!  If we loaded from an HPUX format binary file
+        * we have to dump an HPUX style user struct so that the
+        * HPUX debuggers can grok it.
+        */
+       if (p->p_addr->u_pcb.pcb_flags & PCB_HPUXBIN)
+               error = hpuxdumpu(vp, cred);
+       else
+#endif
+       error = vn_rdwr(UIO_WRITE, vp, (caddr_t) p->p_addr, ctob(UPAGES),
+           (off_t)0, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, (int *) NULL,
+           p);
+       if (error == 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,
+                   (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:
+       VOP_UNLOCK(vp);
+       error1 = vn_close(vp, FWRITE, cred, p);
+       if (error == 0)
+               error = error1;
+       return (error);
 }
 
 }
 
-int ipcreg[] = {R0,R1,R2,R3,R4,R5,R6,R7,R8,R9,R10,R11,AP,FP,SP,PC};
 /*
 /*
- * Code that the child process
- * executes to implement the command
- * of the parent process in tracing.
+ * Nonexistent system call-- signal process (may want to handle it).
+ * Flag error in case process won't see signal immediately (blocked or ignored).
  */
  */
-procxmt()
+/* ARGSUSED */
+nosys(p, args, retval)
+       struct proc *p;
+       void *args;
+       int *retval;
 {
 {
-       register int i;
-       register *p;
-       register struct text *xp;
-
-       if (ipc.ip_lock != u.u_procp->p_pid)
-               return (0);
-       u.u_procp->p_slptime = 0;
-       i = ipc.ip_req;
-       ipc.ip_req = 0;
-       switch (i) {
-
-       /* read user I */
-       case 1:
-               if (!useracc((caddr_t)ipc.ip_addr, 4, B_READ))
-                       goto error;
-               ipc.ip_data = fuiword((caddr_t)ipc.ip_addr);
-               break;
-
-       /* read user D */
-       case 2:
-               if (!useracc((caddr_t)ipc.ip_addr, 4, B_READ))
-                       goto error;
-               ipc.ip_data = fuword((caddr_t)ipc.ip_addr);
-               break;
-
-       /* read u */
-       case 3:
-               i = (int)ipc.ip_addr;
-               if (i<0 || i >= ctob(UPAGES))
-                       goto error;
-               ipc.ip_data = ((physadr)&u)->r[i>>2];
-               break;
-
-       /* write user I */
-       /* Must set up to allow writing */
-       case 4:
-               /*
-                * If text, must assure exclusive use
-                */
-               if (xp = u.u_procp->p_textp) {
-                       if (xp->x_count!=1 || xp->x_iptr->i_mode&ISVTX)
-                               goto error;
-                       xp->x_iptr->i_flag &= ~ITEXT;
-               }
-               i = -1;
-               if (chgprot((caddr_t)ipc.ip_addr, RW) &&
-                   chgprot((caddr_t)ipc.ip_addr+(sizeof(int)-1), RW))
-                       i = suiword((caddr_t)ipc.ip_addr, ipc.ip_data);
-               (void) chgprot((caddr_t)ipc.ip_addr, RO);
-               (void) chgprot((caddr_t)ipc.ip_addr+(sizeof(int)-1), RO);
-               if (i < 0)
-                       goto error;
-               if (xp)
-                       xp->x_flag |= XWRIT;
-               break;
 
 
-       /* write user D */
-       case 5:
-               if (suword((caddr_t)ipc.ip_addr, 0) < 0)
-                       goto error;
-               (void) suword((caddr_t)ipc.ip_addr, ipc.ip_data);
-               break;
-
-       /* write u */
-       case 6:
-               i = (int)ipc.ip_addr;
-               p = (int *)&((physadr)&u)->r[i>>2];
-               for (i=0; i<16; i++)
-                       if (p == &u.u_ar0[ipcreg[i]])
-                               goto ok;
-               if (p == &u.u_ar0[PS]) {
-                       ipc.ip_data |= PSL_CURMOD|PSL_PRVMOD;
-                       ipc.ip_data &=  ~PSL_USERCLR;
-                       goto ok;
-               }
-               goto error;
-
-       ok:
-               *p = ipc.ip_data;
-               break;
-
-       /* set signal and continue */
-       /* one version causes a trace-trap */
-       case 9:
-       case 7:
-               if ((int)ipc.ip_addr != 1)
-                       u.u_ar0[PC] = (int)ipc.ip_addr;
-               if ((unsigned)ipc.ip_data > NSIG)
-                       goto error;
-               u.u_procp->p_cursig = ipc.ip_data;      /* see issig */
-               if (i == 9)
-                       u.u_ar0[PS] |= PSL_T;
-               wakeup((caddr_t)&ipc);
-               return (1);
-
-       /* force exit */
-       case 8:
-               wakeup((caddr_t)&ipc);
-               exit(u.u_procp->p_cursig);
-
-       default:
-       error:
-               ipc.ip_req = -1;
-       }
-       wakeup((caddr_t)&ipc);
-       return (0);
+       psignal(p, SIGSYS);
+       return (EINVAL);
 }
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.