summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoug <doug@openbsd.org>2015-08-21 07:26:09 +0000
committerdoug <doug@openbsd.org>2015-08-21 07:26:09 +0000
commit4cd0ce138207b78267419adeadf194afaad774b9 (patch)
treed4bddaec9e1841b3740ad816df5dc95f6554650e
parentuse vaddr_t for kernel va range calculation instead of paddr_t. No binary (diff)
downloadwireguard-openbsd-4cd0ce138207b78267419adeadf194afaad774b9.tar.xz
wireguard-openbsd-4cd0ce138207b78267419adeadf194afaad774b9.zip
Whitelist TIOCGPGRP (for tcgetpgrp()) in TAME_IOCTL.
Requested by Sunil Nimmagadda to help tame http. ok deraadt@
-rw-r--r--lib/libc/sys/tame.25
-rw-r--r--sys/kern/kern_tame.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/sys/tame.2 b/lib/libc/sys/tame.2
index 4e3463a61b4..d517210cb46 100644
--- a/lib/libc/sys/tame.2
+++ b/lib/libc/sys/tame.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tame.2,v 1.15 2015/07/28 18:20:41 deraadt Exp $
+.\" $OpenBSD: tame.2,v 1.16 2015/08/21 07:26:09 doug Exp $
.\"
.\" Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 28 2015 $
+.Dd $Mdocdate: August 21 2015 $
.Dt TAME 2
.Os
.Sh NAME
@@ -340,6 +340,7 @@ operations:
.Dv FIONREAD ,
.Dv FIONBIO ,
.Dv FIOGETOWN ,
+.Dv TIOCGPGRP ,
.Dv TIOCGWINSZ ,
.Dv TIOCSTI .
.It Dv TAME_PROC
diff --git a/sys/kern/kern_tame.c b/sys/kern/kern_tame.c
index 49acb84285b..6aeef3c0f16 100644
--- a/sys/kern/kern_tame.c
+++ b/sys/kern/kern_tame.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_tame.c,v 1.19 2015/08/20 06:00:23 deraadt Exp $ */
+/* $OpenBSD: kern_tame.c,v 1.20 2015/08/21 07:26:09 doug Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -728,6 +728,7 @@ tame_ioctl_check(struct proc *p, long com, void *v)
return (EPERM);
/* tty subsystem */
+ case TIOCGPGRP:
case TIOCGWINSZ: /* various programs */
case TIOCSTI: /* ksh? csh? */
if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY))