diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-10-28 11:22:08 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-10-28 11:22:08 +0000 |
| commit | fbfe4ec4423c9cd8359ad0f476f485c17583723a (patch) | |
| tree | a6bca6401e6e5c94ac1c4f1972f8ed63b0f40774 | |
| parent | Set pledgenote to PLEDGE_RPATH in chdir & chroot (diff) | |
| download | wireguard-openbsd-fbfe4ec4423c9cd8359ad0f476f485c17583723a.tar.xz wireguard-openbsd-fbfe4ec4423c9cd8359ad0f476f485c17583723a.zip | |
There are three situations where pty ioctl's result in a NDINIT.
NDINIT should be preceded by setting pledgenote to indicate what
the operation is for.
| -rw-r--r-- | sys/kern/tty_pty.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 71e5d2777e1..81d5b5d5fc7 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_pty.c,v 1.71 2015/09/28 19:16:04 deraadt Exp $ */ +/* $OpenBSD: tty_pty.c,v 1.72 2015/10/28 11:22:08 deraadt Exp $ */ /* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */ /* @@ -55,6 +55,7 @@ #include <sys/stat.h> #include <sys/sysctl.h> #include <sys/poll.h> +#include <sys/pledge.h> #include <sys/rwlock.h> #define BUFSIZ 100 /* Chunk size iomoved to/from user */ @@ -1099,6 +1100,7 @@ retry: if ((error = check_pty(minor(newdev)))) goto bad; pti = pt_softc[minor(newdev)]; + p->p_pledgenote = PLEDGE_RPATH | PLEDGE_WPATH; NDINIT(&cnd, LOOKUP, NOFOLLOW|LOCKLEAF, UIO_SYSSPACE, pti->pty_pn, p); if ((error = ptm_vn_open(&cnd)) != 0) { @@ -1125,6 +1127,7 @@ retry: * 2. Revoke all the users of the slave. * 3. open the slave. */ + p->p_pledgenote = PLEDGE_RPATH | PLEDGE_WPATH; NDINIT(&snd, LOOKUP, NOFOLLOW|LOCKLEAF, UIO_SYSSPACE, pti->pty_sn, p); if ((error = namei(&snd)) != 0) @@ -1158,6 +1161,7 @@ retry: */ vrele(snd.ni_vp); + p->p_pledgenote = PLEDGE_RPATH | PLEDGE_WPATH; NDINIT(&snd, LOOKUP, NOFOLLOW|LOCKLEAF, UIO_SYSSPACE, pti->pty_sn, p); /* now open it */ |