diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-10-16 14:00:37 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-10-16 14:00:37 +0000 |
| commit | 195eedf69e5d695177b93d14ed32374b43cd681c (patch) | |
| tree | 9faf83e5edbe0f3cb234661093705b6ed295bf81 | |
| parent | For "tty" pledges, treat TIOCGPGRP and TIOCGWINSZ like TIOCGETA - (diff) | |
| download | wireguard-openbsd-195eedf69e5d695177b93d14ed32374b43cd681c.tar.xz wireguard-openbsd-195eedf69e5d695177b93d14ed32374b43cd681c.zip | |
Place TIOCSTI reminder block better
| -rw-r--r-- | sys/kern/kern_pledge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 511378a8ef9..ee0c65ce503 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.34 2015/10/16 13:59:58 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.35 2015/10/16 14:00:37 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -1075,6 +1075,12 @@ pledge_ioctl_check(struct proc *p, long com, void *v) if ((p->p_p->ps_pledge & PLEDGE_TTY)) { switch (com) { +#if notyet + case TIOCSTI: /* ksh? csh? */ + if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY)) + return (0); + break; +#endif case TIOCSPGRP: if ((p->p_p->ps_pledge & PLEDGE_PROC) == 0) break; @@ -1085,12 +1091,6 @@ pledge_ioctl_check(struct proc *p, long com, void *v) if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY)) return (0); return (ENOTTY); -#if notyet - case TIOCSTI: /* ksh? csh? */ - if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY)) - return (0); - break; -#endif case TIOCSWINSZ: case TIOCCBRK: /* cu */ case TIOCSBRK: /* cu */ |