summaryrefslogtreecommitdiffstats
path: root/sys/kern/tty_pty.c
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2011-04-18 21:44:55 +0000
committerguenther <guenther@openbsd.org>2011-04-18 21:44:55 +0000
commit80b87c503b3a5eaa2c4345d138a3da33607b5c6d (patch)
tree7e739a305397041b071ba9b077444161d3b477e3 /sys/kern/tty_pty.c
parentPerl security fix for CVE-2011-1487: (diff)
downloadwireguard-openbsd-80b87c503b3a5eaa2c4345d138a3da33607b5c6d.tar.xz
wireguard-openbsd-80b87c503b3a5eaa2c4345d138a3da33607b5c6d.zip
Revert the sigacts diff: NFS can apparently retain pointers to processes
until they're zombies and then send them signals (for intr mounts). Until that is untangled, the sigacts change is unsafe. sthen@ was the victim for this one
Diffstat (limited to 'sys/kern/tty_pty.c')
-rw-r--r--sys/kern/tty_pty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 2eef0737115..8539d2d54ce 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_pty.c,v 1.54 2011/04/15 04:52:40 guenther Exp $ */
+/* $OpenBSD: tty_pty.c,v 1.55 2011/04/18 21:44:56 guenther Exp $ */
/* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */
/*
@@ -291,7 +291,7 @@ ptsread(dev_t dev, struct uio *uio, int flag)
again:
if (pti->pt_flags & PF_REMOTE) {
while (isbackground(pr, tp)) {
- if ((p->p_sigacts->ps_sigignore & sigmask(SIGTTIN)) ||
+ if ((p->p_sigignore & sigmask(SIGTTIN)) ||
(p->p_sigmask & sigmask(SIGTTIN)) ||
pr->ps_pgrp->pg_jobc == 0 ||
pr->ps_flags & PS_PPWAIT)