diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-10-16 15:39:15 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-10-16 15:39:15 +0000 |
| commit | 9e81d7929f2251b4c6bbddd4dbed6e4f6084eb26 (patch) | |
| tree | 5745d64301ba0f6622faf7fa396cff4447e9a7ad /sys/kern/kern_pledge.c | |
| parent | c96df25a45b2369710967d49ce87740b88f1ec45 (diff) | |
Allow PTMGET with "tty rpath wpath" but restrict only to /dev/ptm by
checking cdevsw. ok deraadt
Diffstat (limited to 'sys/kern/kern_pledge.c')
| -rw-r--r-- | sys/kern/kern_pledge.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 6bcbaf2f15f..38473c94c3d 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.37 2015/10/16 14:20:48 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.38 2015/10/16 15:39:14 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -32,6 +32,7 @@ #include <sys/ioctl.h> #include <sys/termios.h> +#include <sys/tty.h> #include <sys/mtio.h> #include <net/bpf.h> #include <net/route.h> @@ -42,6 +43,8 @@ #include <netinet6/nd6.h> #include <netinet/tcp.h> +#include <sys/conf.h> +#include <sys/specdev.h> #include <sys/signal.h> #include <sys/signalvar.h> #include <sys/syscall.h> @@ -1071,6 +1074,16 @@ pledge_ioctl_check(struct proc *p, long com, void *v) if ((p->p_p->ps_pledge & PLEDGE_TTY)) { switch (com) { + case PTMGET: + if ((p->p_p->ps_pledge & PLEDGE_RPATH) == 0) + break; + if ((p->p_p->ps_pledge & PLEDGE_WPATH) == 0) + break; + if (fp->f_type != DTYPE_VNODE || vp->v_type != VCHR) + break; + if (cdevsw[major(vp->v_rdev)].d_open != ptmopen) + break; + return (0); #if notyet case TIOCSTI: /* ksh? csh? */ if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY)) |