diff options
| author |   guenther <guenther@openbsd.org> | 2011-07-05 04:48:01 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2011-07-05 04:48:01 +0000 |
| commit | 2725dadd7d788089a9902b44feabed3569fc8616 (patch) | |
| tree | 247079b02db228e6a9ab47389f8b56deba8cab5f /sys/kern/kern_sysctl.c | |
| parent | Sync to bsd.lv (all coded by kristaps@): (diff) | |
| download | wireguard-openbsd-2725dadd7d788089a9902b44feabed3569fc8616.tar.xz wireguard-openbsd-2725dadd7d788089a9902b44feabed3569fc8616.zip | |
Recommit the reverted sigacts change now that the NFS use-after-free
problem has been tracked down. This fixes the sharing of the signal
handling state: shared bits go in sigacts, per-rthread bits goes in
struct proc.
ok deraadt@
Diffstat (limited to 'sys/kern/kern_sysctl.c')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 4bae14cdbcb..a891d47b7b2 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.205 2011/06/27 03:40:35 guenther Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.206 2011/07/05 04:48:02 guenther Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -45,6 +45,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/resourcevar.h> +#include <sys/signalvar.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/vnode.h> @@ -1482,7 +1483,7 @@ fill_kproc(struct proc *p, struct kinfo_proc *ki) struct timeval ut, st; FILL_KPROC(ki, strlcpy, p, pr, p->p_cred, p->p_ucred, pr->ps_pgrp, - p, pr, s, p->p_vmspace, pr->ps_limit, p->p_stats); + p, pr, s, p->p_vmspace, pr->ps_limit, p->p_stats, p->p_sigacts); /* stuff that's too painful to generalize into the macros */ if (pr->ps_pptr) |