projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
do not return from sigsuspend prematurely
[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 0f68ca9..d63e41e 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,124 +1,121 @@
 /*
 /*
- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
  * All rights reserved.
  *
  * All rights reserved.
  *
- * 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.
+ * %sccs.include.redist.c%
  *
  *
- *     @(#)kern_sig.c  7.11 (Berkeley) %G%
+ *     @(#)kern_sig.c  7.54 (Berkeley) %G%
  */
 
  */
 
-#include "param.h"
-#include "systm.h"
-#include "syscontext.h"        /* XXX */
-#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 "wait.h"
-
-#include "machine/reg.h"
-#include "machine/pte.h"
-#include "machine/psl.h"
-#include "machine/mtpr.h"
-
-#define        stopsigmask     (sigmask(SIGSTOP)|sigmask(SIGTSTP)| \
-                       sigmask(SIGTTIN)|sigmask(SIGTTOU))
-#define defaultignmask (sigmask(SIGCONT)|sigmask(SIGIO)|sigmask(SIGURG)| \
-                       sigmask(SIGCHLD)|sigmask(SIGWINCH)|sigmask(SIGINFO))
+#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 <machine/cpu.h>
+
+#include <vm/vm.h>
+#include <sys/kinfo_proc.h>
+#include <sys/user.h>          /* for coredump */
 
 /*
 
 /*
- * Can the current process (u.u_procp) send the specified signal
- * to the specified process?
+ * Can process p, with pcred pc, send the signal signo to process q?
  */
  */
-#define CANSIGNAL(p, signo) \
-       (u.u_uid == 0 || \
-           u.u_uid == (p)->p_uid || u.u_uid == (p)->p_ruid || \
-           u.u_procp->p_ruid == (p)->p_uid || \
-           u.u_procp->p_ruid == (p)->p_ruid || \
-           ((signo) == SIGCONT && (p)->p_session == u.u_procp->p_session))
-
-sigaction()
+#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))
+
+struct sigaction_args {
+       int     signo;
+       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  sigaction *nsa;
-               struct  sigaction *osa;
-       } *uap = (struct a  *)u.u_ap;
        struct sigaction vec;
        register struct sigaction *sa;
        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)
        register int sig;
        int bit, error;
 
        sig = uap->signo;
        if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
-               RETURN (EINVAL);
+               return (EINVAL);
        sa = &vec;
        if (uap->osa) {
        sa = &vec;
        if (uap->osa) {
-               sa->sa_handler = u.u_signal[sig];
-               sa->sa_mask = u.u_sigmask[sig];
+               sa->sa_handler = ps->ps_sigact[sig];
+               sa->sa_mask = ps->ps_catchmask[sig];
                bit = sigmask(sig);
                sa->sa_flags = 0;
                bit = sigmask(sig);
                sa->sa_flags = 0;
-               if ((u.u_sigonstack & bit) != 0)
+               if ((ps->ps_sigonstack & bit) != 0)
                        sa->sa_flags |= SA_ONSTACK;
                        sa->sa_flags |= SA_ONSTACK;
-               if ((u.u_sigintr & bit) == 0)
+               if ((ps->ps_sigintr & bit) == 0)
                        sa->sa_flags |= SA_RESTART;
                        sa->sa_flags |= SA_RESTART;
-               if (u.u_procp->p_flag & SNOCLDSTOP)
+               if (p->p_flag & SNOCLDSTOP)
                        sa->sa_flags |= SA_NOCLDSTOP;
                if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
                    sizeof (vec)))
                        sa->sa_flags |= SA_NOCLDSTOP;
                if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
                    sizeof (vec)))
-                       RETURN (error);
+                       return (error);
        }
        if (uap->nsa) {
                if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
                    sizeof (vec)))
        }
        if (uap->nsa) {
                if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
                    sizeof (vec)))
-                       RETURN (error);
-               setsigvec(sig, sa);
+                       return (error);
+               setsigvec(p, sig, sa);
        }
        }
-       RETURN (0);
+       return (0);
 }
 
 }
 
-setsigvec(sig, sa)
+setsigvec(p, sig, sa)
+       register struct proc *p;
        int sig;
        register struct sigaction *sa;
 {
        int sig;
        register struct sigaction *sa;
 {
-       register struct proc *p;
+       register struct sigacts *ps = p->p_sigacts;
        register int bit;
 
        bit = sigmask(sig);
        register int bit;
 
        bit = sigmask(sig);
-       p = u.u_procp;
        /*
         * Change setting atomically.
         */
        (void) splhigh();
        /*
         * Change setting atomically.
         */
        (void) splhigh();
-       u.u_signal[sig] = sa->sa_handler;
-       u.u_sigmask[sig] = sa->sa_mask &~ sigcantmask;
+       ps->ps_sigact[sig] = sa->sa_handler;
+       ps->ps_catchmask[sig] = sa->sa_mask &~ sigcantmask;
        if ((sa->sa_flags & SA_RESTART) == 0)
        if ((sa->sa_flags & SA_RESTART) == 0)
-               u.u_sigintr |= bit;
+               ps->ps_sigintr |= bit;
        else
        else
-               u.u_sigintr &= ~bit;
+               ps->ps_sigintr &= ~bit;
        if (sa->sa_flags & SA_ONSTACK)
        if (sa->sa_flags & SA_ONSTACK)
-               u.u_sigonstack |= bit;
+               ps->ps_sigonstack |= bit;
+       else
+               ps->ps_sigonstack &= ~bit;
+#ifdef COMPAT_SUNOS
+       if (sa->sa_flags & SA_USERTRAMP)
+               ps->ps_usertramp |= bit;
        else
        else
-               u.u_sigonstack &= ~bit;
+               ps->ps_usertramp &= ~bit;
+#endif
        if (sig == SIGCHLD) {
                if (sa->sa_flags & SA_NOCLDSTOP)
                        p->p_flag |= SNOCLDSTOP;
        if (sig == SIGCHLD) {
                if (sa->sa_flags & SA_NOCLDSTOP)
                        p->p_flag |= SNOCLDSTOP;
@@ -132,7 +129,7 @@ setsigvec(sig, sa)
         * as we have to restart the process.
         */
        if (sa->sa_handler == SIG_IGN ||
         * as we have to restart the process.
         */
        if (sa->sa_handler == SIG_IGN ||
-          (bit & defaultignmask && sa->sa_handler == SIG_DFL)) {
+           (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_sig &= ~bit;               /* never to be seen again */
                if (sig != SIGCONT)
                        p->p_sigignore |= bit;  /* easier in psignal */
@@ -151,19 +148,25 @@ setsigvec(sig, sa)
  * Initialize signal state for process 0;
  * set to ignore signals that are ignored by default.
  */
  * Initialize signal state for process 0;
  * set to ignore signals that are ignored by default.
  */
+void
 siginit(p)
        struct proc *p;
 {
 siginit(p)
        struct proc *p;
 {
+       register int i;
 
 
-       p->p_sigignore = defaultignmask &~ sigmask(SIGCONT);
+       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.
  */
 }
 
 /*
  * Reset signals for an exec of the specified process.
  */
+void
 execsigs(p)
        register struct proc *p;
 {
 execsigs(p)
        register struct proc *p;
 {
+       register struct sigacts *ps = p->p_sigacts;
        register int nc, mask;
 
        /*
        register int nc, mask;
 
        /*
@@ -175,20 +178,21 @@ execsigs(p)
                nc = ffs((long)p->p_sigcatch);
                mask = sigmask(nc);
                p->p_sigcatch &= ~mask;
                nc = ffs((long)p->p_sigcatch);
                mask = sigmask(nc);
                p->p_sigcatch &= ~mask;
-               if (mask & defaultignmask) {
+               if (sigprop[nc] & SA_IGNORE) {
                        if (nc != SIGCONT)
                                p->p_sigignore |= mask;
                        p->p_sig &= ~mask;
                }
                        if (nc != SIGCONT)
                                p->p_sigignore |= mask;
                        p->p_sig &= ~mask;
                }
-               u.u_signal[nc] = SIG_DFL;
+               ps->ps_sigact[nc] = SIG_DFL;
        }
        /*
         * Reset stack state to the user stack.
         * Clear set of signals caught on the signal stack.
         */
        }
        /*
         * Reset stack state to the user stack.
         * Clear set of signals caught on the signal stack.
         */
-       u.u_onstack = 0;
-       u.u_sigsp = 0;
-       u.u_sigonstack = 0;
+       ps->ps_sigstk.ss_flags = SA_DISABLE;
+       ps->ps_sigstk.ss_size = 0;
+       ps->ps_sigstk.ss_base = 0;
+       ps->ps_flags = 0;
 }
 
 /*
 }
 
 /*
@@ -197,16 +201,18 @@ execsigs(p)
  * and return old mask as return value;
  * the library stub does the rest.
  */
  * and return old mask as return value;
  * the library stub does the rest.
  */
-sigprocmask()
+struct sigprocmask_args {
+       int     how;
+       sigset_t mask;
+};
+sigprocmask(p, uap, retval)
+       register struct proc *p;
+       struct sigprocmask_args *uap;
+       int *retval;
 {
 {
-       struct a {
-               int     how;
-               sigset_t mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
        int error = 0;
 
        int error = 0;
 
-       u.u_r.r_val1 = p->p_sigmask;
+       *retval = p->p_sigmask;
        (void) splhigh();
 
        switch (uap->how) {
        (void) splhigh();
 
        switch (uap->how) {
@@ -227,197 +233,297 @@ sigprocmask()
                break;
        }
        (void) spl0();
                break;
        }
        (void) spl0();
-       RETURN (error);
+       return (error);
 }
 
 }
 
-sigpending()
+struct sigpending_args {
+       int     dummy;
+};
+/* ARGSUSED */
+sigpending(p, uap, retval)
+       struct proc *p;
+       struct sigpending_args *uap;
+       int *retval;
 {
 
 {
 
-       u.u_r.r_val1 = u.u_procp->p_sig;
-       RETURN (0);
+       *retval = p->p_sig;
+       return (0);
 }
 
 }
 
-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 /*
  * Generalized interface signal handler, 4.3-compatible.
  */
 /*
  * Generalized interface signal handler, 4.3-compatible.
  */
-osigvec()
+struct osigvec_args {
+       int     signo;
+       struct  sigvec *nsv;
+       struct  sigvec *osv;
+};
+/* ARGSUSED */
+osigvec(p, uap, retval)
+       struct proc *p;
+       register struct osigvec_args *uap;
+       int *retval;
 {
 {
-       register struct a {
-               int     signo;
-               struct  sigvec *nsv;
-               struct  sigvec *osv;
-       } *uap = (struct a  *)u.u_ap;
        struct sigvec vec;
        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)
        register struct sigvec *sv;
        register int sig;
        int bit, error;
 
        sig = uap->signo;
        if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
-               RETURN (EINVAL);
+               return (EINVAL);
        sv = &vec;
        if (uap->osv) {
        sv = &vec;
        if (uap->osv) {
-               *(sig_t *)&sv->sv_handler = u.u_signal[sig];
-               sv->sv_mask = u.u_sigmask[sig];
+               *(sig_t *)&sv->sv_handler = ps->ps_sigact[sig];
+               sv->sv_mask = ps->ps_catchmask[sig];
                bit = sigmask(sig);
                sv->sv_flags = 0;
                bit = sigmask(sig);
                sv->sv_flags = 0;
-               if ((u.u_sigonstack & bit) != 0)
+               if ((ps->ps_sigonstack & bit) != 0)
                        sv->sv_flags |= SV_ONSTACK;
                        sv->sv_flags |= SV_ONSTACK;
-               if ((u.u_sigintr & bit) != 0)
+               if ((ps->ps_sigintr & bit) != 0)
                        sv->sv_flags |= SV_INTERRUPT;
                        sv->sv_flags |= SV_INTERRUPT;
-               if (u.u_procp->p_flag & SNOCLDSTOP)
+#ifndef COMPAT_SUNOS
+               if (p->p_flag & SNOCLDSTOP)
                        sv->sv_flags |= SA_NOCLDSTOP;
                        sv->sv_flags |= SA_NOCLDSTOP;
+#endif
                if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
                    sizeof (vec)))
                if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
                    sizeof (vec)))
-                       RETURN (error);
+                       return (error);
        }
        if (uap->nsv) {
                if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
                    sizeof (vec)))
        }
        if (uap->nsv) {
                if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
                    sizeof (vec)))
-                       RETURN (error);
+                       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 */
                sv->sv_flags ^= SA_RESTART;     /* opposite of SV_INTERRUPT */
-               setsigvec(sig, sv);
+               setsigvec(p, sig, (struct sigaction *)sv);
        }
        }
-       RETURN (0);
+       return (0);
 }
 
 }
 
-osigblock()
+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;
+       *retval = p->p_sigmask;
        p->p_sigmask |= uap->mask &~ sigcantmask;
        (void) spl0();
        p->p_sigmask |= uap->mask &~ sigcantmask;
        (void) spl0();
-       RETURN (0);
+       return (0);
 }
 
 }
 
-osigsetmask()
+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();
 
        (void) splhigh();
-       u.u_r.r_val1 = p->p_sigmask;
+       *retval = p->p_sigmask;
        p->p_sigmask = uap->mask &~ sigcantmask;
        (void) spl0();
        p->p_sigmask = uap->mask &~ sigcantmask;
        (void) spl0();
-       RETURN (0);
+       return (0);
 }
 }
-#endif
+#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.
  */
 
 /*
  * 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.
  */
-sigsuspend()
+struct sigsuspend_args {
+       sigset_t mask;
+};
+/* ARGSUSED */
+sigsuspend(p, uap, retval)
+       register struct proc *p;
+       struct sigsuspend_args *uap;
+       int *retval;
 {
 {
-       struct a {
-               sigset_t mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
+       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;
+       ps->ps_oldmask = p->p_sigmask;
+       ps->ps_flags |= SAS_OLDMASK;
        p->p_sigmask = uap->mask &~ sigcantmask;
        p->p_sigmask = uap->mask &~ sigcantmask;
-       for (;;)
-               sleep((caddr_t)&u, PSLEP);
-       /*NOTREACHED*/
+       while (tsleep((caddr_t) ps, PPAUSE|PCATCH, "pause", 0) == 0)
+               /* void */;
+       /* always return EINTR rather than ERESTART... */
+       return (EINTR);
 }
 
 }
 
-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;
 
        int error = 0;
 
-       if (uap->oss && (error = copyout((caddr_t)&u.u_sigstack,
-           (caddr_t)uap->oss, sizeof (struct sigstack))))
-               RETURN (error);
+       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,
        if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
-           sizeof (ss))) == 0)
-               u.u_sigstack = ss;
-       RETURN (error);
+           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;
+       }
+       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;
 
 
-kill()
+       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);
+}
+
+struct kill_args {
+       int     pid;
+       int     signo;
+};
+/* 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 ((unsigned) uap->signo >= NSIG)
 
        if ((unsigned) uap->signo >= NSIG)
-               RETURN (EINVAL);
+               return (EINVAL);
        if (uap->pid > 0) {
                /* kill single process */
                p = pfind(uap->pid);
                if (p == 0)
        if (uap->pid > 0) {
                /* kill single process */
                p = pfind(uap->pid);
                if (p == 0)
-                       RETURN (ESRCH);
-               if (!CANSIGNAL(p, uap->signo))
-                       RETURN (EPERM);
+                       return (ESRCH);
+               if (!CANSIGNAL(cp, pc, p, uap->signo))
+                       return (EPERM);
                if (uap->signo)
                        psignal(p, uap->signo);
                if (uap->signo)
                        psignal(p, uap->signo);
-               RETURN (0);
+               return (0);
        }
        switch (uap->pid) {
        case -1:                /* broadcast signal */
        }
        switch (uap->pid) {
        case -1:                /* broadcast signal */
-               RETURN (killpg1(uap->signo, 0, 1));
+               return (killpg1(cp, uap->signo, 0, 1));
        case 0:                 /* signal own process group */
        case 0:                 /* signal own process group */
-               RETURN (killpg1(uap->signo, 0, 0));
+               return (killpg1(cp, uap->signo, 0, 0));
        default:                /* negative explicit process group */
        default:                /* negative explicit process group */
-               RETURN (killpg1(uap->signo, -uap->pid, 0));
+               return (killpg1(cp, uap->signo, -uap->pid, 0));
        }
        /* NOTREACHED */
 }
 
        }
        /* NOTREACHED */
 }
 
-#ifdef COMPAT_43
-okillpg()
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct okillpg_args {
+       int     pgid;
+       int     signo;
+};
+/* 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 ((unsigned) uap->signo >= NSIG)
 
        if ((unsigned) uap->signo >= NSIG)
-               RETURN (EINVAL);
-       RETURN (killpg1(uap->signo, uap->pgid, 0));
+               return (EINVAL);
+       return (killpg1(p, uap->signo, uap->pgid, 0));
 }
 }
-#endif
+#endif /* COMPAT_43 || COMPAT_SUNOS */
 
 
-killpg1(signo, pgid, all)
+/*
+ * 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;
        int signo, pgid, all;
 {
        register struct proc *p;
+       register struct pcred *pc = cp->p_cred;
        struct pgrp *pgrp;
        struct pgrp *pgrp;
-       int f = 0, error = ESRCH;
+       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 || !CANSIGNAL(p, signo))
+               for (p = (struct proc *)allproc; p != NULL; p = p->p_nxt) {
+                       if (p->p_pid <= 1 || p->p_flag&SSYS || 
+                           p == cp || !CANSIGNAL(cp, pc, p, signo))
                                continue;
                                continue;
-                       f++;
+                       nfound++;
                        if (signo)
                                psignal(p, signo);
                }
                        if (signo)
                                psignal(p, signo);
                }
@@ -426,22 +532,22 @@ killpg1(signo, pgid, all)
                        /* 
                         * zero pgid means send to my process group.
                         */
                        /* 
                         * 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)
                                return (ESRCH);
                }
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
                else {
                        pgrp = pgfind(pgid);
                        if (pgrp == NULL)
                                return (ESRCH);
                }
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
-                       if (p->p_ppid == 0 || p->p_flag&SSYS ||
-                           !CANSIGNAL(p, signo))
+                       if (p->p_pid <= 1 || p->p_flag&SSYS ||
+                           p->p_stat == SZOMB || !CANSIGNAL(cp, pc, p, signo))
                                continue;
                                continue;
-                       f++;
+                       nfound++;
                        if (signo)
                                psignal(p, signo);
                }
        }
                        if (signo)
                                psignal(p, signo);
                }
        }
-       return (f ? 0 : error);
+       return (nfound ? 0 : ESRCH);
 }
 
 /*
 }
 
 /*
@@ -449,21 +555,32 @@ killpg1(signo, pgid, all)
  * all processes with 'pgid' as
  * process group.
  */
  * all processes with 'pgid' as
  * process group.
  */
+void
 gsignal(pgid, sig)
 gsignal(pgid, sig)
+       int pgid, sig;
 {
        struct pgrp *pgrp;
 
        if (pgid && (pgrp = pgfind(pgid)))
 {
        struct pgrp *pgrp;
 
        if (pgid && (pgrp = pgfind(pgid)))
-               pgsignal(pgrp, sig);
+               pgsignal(pgrp, sig, 0);
 }
 
 }
 
-pgsignal(pgrp, sig)
+/*
+ * Send sig to every member of a process group.
+ * If checktty is 1, limit to members which have a controlling
+ * terminal.
+ */
+void
+pgsignal(pgrp, sig, checkctty)
        struct pgrp *pgrp;
        struct pgrp *pgrp;
+       int sig, checkctty;
 {
        register struct proc *p;
 
 {
        register struct proc *p;
 
-       for (p = pgrp->pg_mem; p; 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&SCTTY)
+                               psignal(p, sig);
 }
 
 /*
 }
 
 /*
@@ -471,43 +588,57 @@ pgsignal(pgrp, sig)
  * If it will be caught immediately, deliver it with correct code.
  * Otherwise, post it normally.
  */
  * If it will be caught immediately, deliver it with correct code.
  * Otherwise, post it normally.
  */
-trapsignal(sig, code)
+void
+trapsignal(p, sig, code)
+       struct proc *p;
        register int sig;
        unsigned code;
 {
        register int sig;
        unsigned code;
 {
-       register struct proc *p = u.u_procp;
+       register struct sigacts *ps = p->p_sigacts;
        int mask;
 
        mask = sigmask(sig);
        if ((p->p_flag & STRC) == 0 && (p->p_sigcatch & mask) != 0 &&
            (p->p_sigmask & mask) == 0) {
        int mask;
 
        mask = sigmask(sig);
        if ((p->p_flag & STRC) == 0 && (p->p_sigcatch & mask) != 0 &&
            (p->p_sigmask & mask) == 0) {
-               u.u_ru.ru_nsignals++;
-               sendsig(u.u_signal[sig], sig, p->p_sigmask, code);
-               p->p_sigmask |= u.u_sigmask[sig] | mask;
+               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 {
        } else {
-               u.u_arg[1] = code;      /* XXX for core dump/debugger */
+               ps->ps_code = code;     /* XXX for core dump/debugger */
                psignal(p, sig);
        }
 }
 
 /*
                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 s, prop;
        register sig_t action;
        int mask;
 
        if ((unsigned)sig >= NSIG || sig == 0)
                panic("psignal sig");
        register sig_t action;
        int mask;
 
        if ((unsigned)sig >= NSIG || sig == 0)
                panic("psignal sig");
-       if (p->p_pgrp->pg_jobc == 0 && 
-            (sig == SIGTTIN || sig == SIGTTOU || sig == SIGTSTP))
-               return;
        mask = sigmask(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.
@@ -531,28 +662,25 @@ psignal(p, sig)
                else
                        action = SIG_DFL;
        }
                else
                        action = SIG_DFL;
        }
-       switch (sig) {
 
 
-       case SIGTERM:
-               if ((p->p_flag&STRC) || action != SIG_DFL)
-                       break;
-               /* FALLTHROUGH */
-
-       case SIGKILL:
-               if (p->p_nice > NZERO)
-                       p->p_nice = NZERO;
-               break;
+       if (p->p_nice > NZERO && (sig == SIGKILL ||
+           sig == SIGTERM && (p->p_flag&STRC || action != SIG_DFL)))
+               p->p_nice = NZERO;
 
 
-       case SIGCONT:
+       if (prop & SA_CONT)
                p->p_sig &= ~stopsigmask;
                p->p_sig &= ~stopsigmask;
-               break;
 
 
-       case SIGTSTP:
-       case SIGTTIN:
-       case SIGTTOU:
-       case SIGSTOP:
-               p->p_sig &= ~sigmask(SIGCONT);
-               break;
+       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;
        }
        p->p_sig |= mask;
 
        }
        p->p_sig |= mask;
 
@@ -560,19 +688,19 @@ psignal(p, sig)
         * Defer further processing for signals which are held,
         * except that stopped processes must be continued by SIGCONT.
         */
         * Defer further processing for signals which are held,
         * except that stopped processes must be continued by SIGCONT.
         */
-       if (action == SIG_HOLD && (sig != SIGCONT || p->p_stat != SSTOP))
+       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 & SSINTR) == 0)
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
@@ -587,17 +715,17 @@ psignal(p, sig)
                 * All other (caught or default) signals
                 * cause the process to run.
                 */
                 * All other (caught or default) signals
                 * cause the process to run.
                 */
-               if (mask & stopsigmask) {
+               if (prop & SA_STOP) {
                        if (action != SIG_DFL)
                                goto runfast;
                        /*
                        if (action != SIG_DFL)
                                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;
                        p->p_sig &= ~mask;
                                goto out;
                        p->p_sig &= ~mask;
-                       p->p_cursig = sig;
+                       p->p_xstat = sig;
                        if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
                                psignal(p->p_pptr, SIGCHLD);
                        stop(p);
                        if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
                                psignal(p->p_pptr, SIGCHLD);
                        stop(p);
@@ -613,15 +741,14 @@ 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.
-                        */
+               /*
+                * Kill signal always sets processes running.
+                */
+               if (sig == SIGKILL)
                        goto runfast;
 
                        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,
                        /*
                         * If SIGCONT is default (or ignored), we continue
                         * the process but don't leave the signal in p_sig,
@@ -632,7 +759,6 @@ psignal(p, sig)
                         * 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.
                         */
-                       p->p_cursig = 0;        /* ??? XXX */
                        if (action == SIG_DFL)
                                p->p_sig &= ~mask;
                        if (action == SIG_CATCH)
                        if (action == SIG_DFL)
                                p->p_sig &= ~mask;
                        if (action == SIG_CATCH)
@@ -641,31 +767,26 @@ psignal(p, sig)
                                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.)
                         */
                        p->p_sig &= ~mask;              /* take it away */
                        goto out;
                        /*
                         * 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);
-                       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:
                /*
@@ -673,8 +794,8 @@ 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*/
@@ -692,100 +813,130 @@ out:
 }
 
 /*
 }
 
 /*
- * 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.)
- * Most signals do not do anything
- * directly to a process; they set
- * 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, mask;
+{
+       register int sig, mask, prop;
 
 
-       p = u.u_procp;
        for (;;) {
                mask = p->p_sig &~ p->p_sigmask;
        for (;;) {
                mask = p->p_sig &~ p->p_sigmask;
-               if (p->p_flag&SVFORK)
+               if (p->p_flag&SPPWAIT)
                        mask &= ~stopsigmask;
                        mask &= ~stopsigmask;
-               if (mask == 0)
-                       break;
+               if (mask == 0)          /* no signal to send */
+                       return (0);
                sig = ffs((long)mask);
                mask = sigmask(sig);
                sig = ffs((long)mask);
                mask = sigmask(sig);
-               p->p_sig &= ~mask;              /* take the signal! */
-               if (mask & p->p_sigignore && (p->p_flag&STRC) == 0)
-                       continue;       /* only if STRC was on when posted */
-               p->p_cursig = sig;
-               if (p->p_flag&STRC && (p->p_flag&SVFORK) == 0) {
+               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();
                        psignal(p->p_pptr, SIGCHLD);
                        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 p_sig* 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 |= mask;
+                       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;
 
                        /*
-                        * If signal is being masked put it back
-                        * into p_sig and look for other signals.
+                        * Put the new signal into p_sig.
+                        * If signal is being masked,
+                        * look for other signals.
                         */
                        mask = sigmask(sig);
                         */
                        mask = sigmask(sig);
-                       if (p->p_sigmask & mask) {
-                               p->p_sig |= mask;
+                       p->p_sig |= 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[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)
-                               continue;
-                       if (mask & stopsigmask) {
-                               if (p->p_flag&STRC)
-                                       continue;
+                       if (p->p_pid <= 1) {
+#ifdef DIAGNOSTIC
+                               /*
+                                * Are you sure you want to ignore SIGSEGV
+                                * in init? XXX
+                                */
+                               printf("Process (pid %d) got signal %d\n",
+                                       p->p_pid, sig);
+#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&STRC ||
+                                   (p->p_pgrp->pg_jobc == 0 &&
+                                   prop & SA_TTYSTOP))
+                                       break;  /* == ignore */
+                               p->p_xstat = sig;
                                stop(p);
                                if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
                                        psignal(p->p_pptr, SIGCHLD);
                                swtch();
                                stop(p);
                                if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
                                        psignal(p->p_pptr, SIGCHLD);
                                swtch();
-                               continue;
-                       } else if (mask & defaultignmask) {
+                               break;
+                       } else if (prop & SA_IGNORE) {
                                /*
                                 * Except for SIGCONT, shouldn't get here.
                                 * Default action is to ignore; drop it.
                                 */
                                /*
                                 * Except for SIGCONT, shouldn't get here.
                                 * Default action is to ignore; drop it.
                                 */
-                               continue;               /* == ignore */
+                               break;          /* == ignore */
                        } else
                        } else
-                               goto send;
+                               return (sig);
                        /*NOTREACHED*/
 
                case SIG_IGN:
                        /*NOTREACHED*/
 
                case SIG_IGN:
@@ -794,36 +945,27 @@ issig()
                         * to take action on an ignored signal other
                         * than SIGCONT, unless process is traced.
                         */
                         * to take action on an ignored signal other
                         * than SIGCONT, unless process is traced.
                         */
-                       if (sig != SIGCONT && (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*/
+               p->p_sig &= ~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;
  */
 stop(p)
        register struct proc *p;
@@ -835,140 +977,160 @@ stop(p)
 }
 
 /*
 }
 
 /*
- * Perform the action specified by
- * the current signal.
- * The usual sequence is:
- *     if (p->p_cursig || ISSIG(p))
- *             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()
-{
-       register struct proc *p = u.u_procp;
+void
+psig(sig)
        register int sig;
        register int sig;
-       int mask, returnmask;
+{
+       register struct proc *p = curproc;
+       register struct sigacts *ps = p->p_sigacts;
        register sig_t action;
        register sig_t action;
+       int mask, returnmask;
 
 
-       do {
-               sig = p->p_cursig;
-               mask = sigmask(sig);
-               if (sig == 0)
-                       panic("psig");
-               action = u.u_signal[sig];
-               if (action != SIG_DFL) {
 #ifdef DIAGNOSTIC
 #ifdef DIAGNOSTIC
-                       if (action == SIG_IGN || (p->p_sigmask & mask))
-                               panic("psig action");
+       if (sig == 0)
+               panic("psig");
 #endif
 #endif
-                       u.u_error = 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 (p->p_flag & SOMASK) {
-                               returnmask = u.u_oldmask;
-                               p->p_flag &= ~SOMASK;
-                       } else
-                               returnmask = p->p_sigmask;
-                       p->p_sigmask |= u.u_sigmask[sig] | mask;
-                       (void) spl0();
-                       u.u_ru.ru_nsignals++;
-                       sendsig(action, sig, returnmask, 0);
-                       p->p_cursig = 0;
-                       continue;
-               }
-               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 |= WCOREFLAG;
-               }
-               exit(W_EXITCODE(0, sig));
+       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 & 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, sig);
                /* NOTREACHED */
                /* NOTREACHED */
-       } while (ISSIG(p));
+       } else {
+               /*
+                * If we get here, the signal must be caught.
+                */
+#ifdef DIAGNOSTIC
+               if (action == SIG_IGN || (p->p_sigmask & mask))
+                       panic("psig action");
+#endif
+               /*
+                * 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 & SAS_OLDMASK) {
+                       returnmask = ps->ps_oldmask;
+                       ps->ps_flags &= ~SAS_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);
+       }
+}
+
+/*
+ * 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, sig)
+       register struct proc *p;
+       int sig;
+{
+
+       p->p_acflag |= AXSIG;
+       if (sigprop[sig] & SA_CORE) {
+               p->p_sigacts->ps_sig = sig;
+               if (coredump(p) == 0)
+                       sig |= WCOREFLAG;
+       }
+       exit1(p, W_EXITCODE(0, sig));
+       /* NOTREACHED */
 }
 
 /*
 }
 
 /*
- * Create a core image on the file "core".
- * It writes UPAGES block of the
- * user.h area followed by the entire
- * data+stack segments.
+ * Create a core dump.
+ * The file name is "core.progname".
+ * Core dumps are not created if the process is setuid.
  */
  */
-core()
+coredump(p)
+       register struct proc *p;
 {
        register struct vnode *vp;
 {
        register struct vnode *vp;
-       register struct proc *p = u.u_procp;
-       register struct nameidata *ndp = &u.u_nd;
+       register struct pcred *pcred = p->p_cred;
+       register struct ucred *cred = pcred->pc_ucred;
+       register struct vmspace *vm = p->p_vmspace;
        struct vattr vattr;
        struct vattr vattr;
-       int error;
+       int error, error1;
+       struct nameidata nd;
+       char name[MAXCOMLEN+6]; /* core.progname */
 
 
-       if (p->p_svuid != p->p_ruid || p->p_svgid != p->p_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 (p->p_textp) {
-               VOP_LOCK(p->p_textp->x_vptr);
-               error = VOP_ACCESS(p->p_textp->x_vptr, VREAD, u.u_cred);
-               VOP_UNLOCK(p->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, "core.%s", p->p_comm);
+       NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, name, p);
+       if (error = vn_open(&nd, O_CREAT|FWRITE, 0644))
                return (error);
                return (error);
-       vp = ndp->ni_vp;
-       VOP_LOCK(vp);
-       if (vp->v_type != VREG ||
-           VOP_GETATTR(vp, &vattr, u.u_cred) ||
+       vp = nd.ni_vp;
+       if (vp->v_type != VREG || VOP_GETATTR(vp, &vattr, cred, p) ||
            vattr.va_nlink != 1) {
            vattr.va_nlink != 1) {
-               vput(vp);
-               return (EFAULT);
-       }
-#ifdef MMAP
-       { register int fd;
-       /* unmap 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);
+               error = EFAULT;
+               goto out;
        }
        }
-#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_NODELOCKED|IO_UNIT, ndp->ni_cred, (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(p, 0)),
-                   (int)ctob(u.u_dsize), (off_t)ctob(UPAGES), UIO_USERSPACE,
-                   IO_NODELOCKED|IO_UNIT, ndp->ni_cred, (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(p, u.u_ssize - 1)),
-                   (int)ctob(u.u_ssize),
-                   (off_t)ctob(UPAGES) + ctob(u.u_dsize), UIO_USERSPACE,
-                   IO_NODELOCKED|IO_UNIT, ndp->ni_cred, (int *)0);
-       vput(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);
 }
 
        return (error);
 }
 
@@ -976,9 +1138,16 @@ core()
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */
-nosys()
+struct nosys_args {
+       int     dummy;
+};
+/* ARGSUSED */
+nosys(p, args, retval)
+       struct proc *p;
+       struct nosys_args *args;
+       int *retval;
 {
 
 {
 
-       psignal(u.u_procp, SIGSYS);
-       u.u_error = EINVAL;
+       psignal(p, SIGSYS);
+       return (EINVAL);
 }
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.