]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/tty_pty.c
xnu-1228.15.4.tar.gz
[apple/xnu.git] / bsd / kern / tty_pty.c
index 34dc94304a3053d4ee6b33ac52a9ca4b8852ec38..ed2042b7f4c95d28db0c03e07351356eaf3669ea 100644 (file)
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1997-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,9 +23,8 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/* Copyright (c) 1997 Apple Computer, Inc. All Rights Reserved */
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
-#include <sys/proc.h>
+#include <sys/proc_internal.h>
+#include <sys/kauth.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/file_internal.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/user.h>
 #include <sys/signalvar.h>
 
-#ifndef NeXT
-
-#define FREE_BSDSTATIC static
-#else
-#include <machine/spl.h>
-
-#define FREE_BSDSTATIC __private_extern__
-#define d_open_t        open_close_fcn_t
-#define d_close_t       open_close_fcn_t
 #define d_devtotty_t    struct tty **
-#define d_ioctl_t       ioctl_fcn_t
-#define d_read_t        read_write_fcn_t 
-#define d_write_t       read_write_fcn_t
-#define d_select_t      select_fcn_t
-typedef void d_stop_t  __P((struct tty *tp, int rw));
-#endif /* NeXT */
-
-#ifdef notyet
-static void ptyattach __P((int n));
-#endif
-static void ptsstart __P((struct tty *tp));
-static void ptcwakeup __P((struct tty *tp, int flag));
-
-FREE_BSDSTATIC d_open_t        ptsopen;
-FREE_BSDSTATIC d_close_t       ptsclose;
-FREE_BSDSTATIC d_read_t        ptsread;
-FREE_BSDSTATIC d_write_t       ptswrite;
-FREE_BSDSTATIC d_ioctl_t       ptyioctl;
-FREE_BSDSTATIC d_stop_t        ptsstop;
-FREE_BSDSTATIC d_devtotty_t    ptydevtotty;
-FREE_BSDSTATIC d_open_t        ptcopen;
-FREE_BSDSTATIC d_close_t       ptcclose;
-FREE_BSDSTATIC d_read_t        ptcread;
-FREE_BSDSTATIC d_write_t       ptcwrite;
-FREE_BSDSTATIC d_select_t      ptcselect;
-
-#ifndef NeXT
-#define CDEV_MAJOR_S 5
-#define CDEV_MAJOR_C 6
-static struct cdevsw pts_cdevsw = 
-       { ptsopen,      ptsclose,       ptsread,        ptswrite,       /*5*/
-         ptyioctl,     ptsstop,        nullreset,      ptydevtotty,/* ttyp */
-         ttselect,     nommap,         NULL,   "pts",  NULL,   -1 };
-
-static struct cdevsw ptc_cdevsw = 
-       { ptcopen,      ptcclose,       ptcread,        ptcwrite,       /*6*/
-         ptyioctl,     nullstop,       nullreset,      ptydevtotty,/* ptyp */
-         ptcselect,    nommap,         NULL,   "ptc",  NULL,   -1 };
-#endif /* !NeXT */
 
+#ifdef d_stop_t
+#undef d_stop_t
+#endif
+typedef void d_stop_t(struct tty *tp, int rw);
+
+/* XXX function should be removed??? */
+int pty_init(int n_ptys);
+
+/* XXX should be a devfs function */
+int _devfs_setattr(void * handle, unsigned short mode, uid_t uid, gid_t gid);
+
+static void ptsstart(struct tty *tp);
+static void ptcwakeup(struct tty *tp, int flag);
+
+__private_extern__     d_open_t        ptsopen;
+__private_extern__     d_close_t       ptsclose;
+__private_extern__     d_read_t        ptsread;
+__private_extern__     d_write_t       ptswrite;
+__private_extern__     d_ioctl_t       ptyioctl;
+__private_extern__     d_stop_t        ptsstop;
+__private_extern__     d_devtotty_t    ptydevtotty;
+__private_extern__     d_open_t        ptcopen;
+__private_extern__     d_close_t       ptcclose;
+__private_extern__     d_read_t        ptcread;
+__private_extern__     d_write_t       ptcwrite;
+__private_extern__     d_select_t      ptcselect;
 
 #if NPTY == 1
 #undef NPTY
@@ -134,38 +115,21 @@ static struct cdevsw ptc_cdevsw =
 #warning       You have only one pty defined, redefining to 32.
 #endif
 
-#ifndef NeXT
-#ifdef DEVFS
-#define MAXUNITS (8 * 32)
-static void    *devfs_token_pts[MAXUNITS];
-static void    *devfs_token_ptc[MAXUNITS];
-static  const  char jnames[] = "pqrsPQRS";
-#if NPTY > MAXUNITS
-#undef NPTY
-#define NPTY MAXUNITS
-#warning       Can't have more than 256 pty's with DEVFS defined.
-#endif /* NPTY > MAXUNITS */
-#endif /* DEVFS */
-#endif /* !NeXT */
-
 #define BUFSIZ 100             /* Chunk size iomoved to/from user */
 
 /*
  * pts == /dev/tty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv]
  * ptc == /dev/pty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv]
  */
-#ifndef NeXT
-FREE_BSDSTATIC struct  tty pt_tty[NPTY];       /* XXX */
-#else /* NeXT */
-/* NeXT All references to have been changed to indirections in the file */
-FREE_BSDSTATIC struct  tty *pt_tty[NPTY] = { NULL };
-#endif /* ! NeXT */
+/* All references to have been changed to indirections in the file */
+__private_extern__ struct      tty *pt_tty[NPTY] = { NULL };
 
 static struct  pt_ioctl {
        int     pt_flags;
        struct  selinfo pt_selr, pt_selw;
        u_char  pt_send;
        u_char  pt_ucntl;
+       void    *pt_devhandle;  /* slave device handle for grantpt() */
 } pt_ioctl[NPTY];              /* XXX */
 static int     npty = NPTY;            /* for pstat -t */
 
@@ -175,40 +139,9 @@ static int npty = NPTY;            /* for pstat -t */
 #define        PF_NOSTOP       0x40
 #define PF_UCNTL       0x80            /* user control mode */
 
-#ifdef notyet
-/*
- * Establish n (or default if n is 1) ptys in the system.
- *
- * XXX cdevsw & pstat require the array `pty[]' to be an array
- */
-FREEBSD_STATIC void
-ptyattach(n)
-       int n;
-{
-       char *mem;
-       register u_long ntb;
-#define        DEFAULT_NPTY    32
-
-       /* maybe should allow 0 => none? */
-       if (n <= 1)
-               n = DEFAULT_NPTY;
-       ntb = n * sizeof(struct tty);
-#ifndef NeXT
-       mem = malloc(ntb + ALIGNBYTES + n * sizeof(struct pt_ioctl),
-           M_DEVBUF, M_WAITOK);
-#else
-       MALLOC(mem, char *, ntb + ALIGNBYTES + n * sizeof(struct pt_ioctl),
-                       M_DEVBUF, M_WAITOK);
-#endif /* !NeXT */
-       pt_tty = (struct tty *)mem;
-       mem = (char *)ALIGN(mem + ntb);
-       pt_ioctl = (struct pt_ioctl *)mem;
-       npty = n;
-}
-#endif
-
 #ifndef DEVFS
-int pty_init()
+int
+pty_init(__unused int n_ptys)
 {
     return 0;
 }
@@ -216,7 +149,8 @@ int pty_init()
 #include <miscfs/devfs/devfs.h>
 #define START_CHAR     'p'
 #define HEX_BASE       16
-int pty_init(int n_ptys)
+int
+pty_init(int n_ptys)
 {
     int        i;
     int                j;
@@ -227,7 +161,7 @@ int pty_init(int n_ptys)
            int m = j * HEX_BASE + i;
            if (m == n_ptys)
                goto done;
-           (void)devfs_make_node(makedev(4, m), 
+           pt_ioctl[m].pt_devhandle = devfs_make_node(makedev(4, m), 
                                  DEVFS_CHAR, UID_ROOT, GID_WHEEL, 0666, 
                                  "tty%c%x", j + START_CHAR, i);
            (void)devfs_make_node(makedev(5, m), 
@@ -238,32 +172,35 @@ int pty_init(int n_ptys)
  done:
     return (0);
 }
-#endif DEVFS
-
-/*ARGSUSED*/
-FREE_BSDSTATIC int
-ptsopen(dev, flag, devtype, p)
-       dev_t dev;
-       int flag, devtype;
-       struct proc *p;
+#endif /* DEVFS */
+
+__private_extern__ int
+ptsopen(dev_t dev, int flag, __unused int devtype, __unused struct proc *p)
 {
-       register struct tty *tp;
+       struct tty *tp;
        int error;
+       boolean_t   funnel_state;
 
-#ifndef NeXT
-       tp = &pt_tty[minor(dev)];
-#else
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
        /*
-        * You will see this sourt of code coming up in diffs later both
+        * You will see this sort of code coming up in diffs later both
         * the ttymalloc and the tp indirection.
         */
-       if (minor(dev) >= npty)
-               return (ENXIO);
+       if (minor(dev) >= npty) {
+               error = ENXIO;
+               goto out;
+       }
        if (!pt_tty[minor(dev)]) {
-               tp = pt_tty[minor(dev)] = ttymalloc();
+               /*
+                * If we can't allocate a new one, act as if we had run out
+                * of device nodes.
+                */
+               if ((tp = pt_tty[minor(dev)] = ttymalloc()) == NULL) {
+                       error = ENXIO;
+                       goto out;
+               }
        } else
                tp = pt_tty[minor(dev)];
-#endif
        if ((tp->t_state & TS_ISOPEN) == 0) {
                ttychars(tp);           /* Set up default chars */
                tp->t_iflag = TTYDEF_IFLAG;
@@ -272,8 +209,10 @@ ptsopen(dev, flag, devtype, p)
                tp->t_cflag = TTYDEF_CFLAG;
                tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
                ttsetwater(tp);         /* would be done in xxparam() */
-       } else if (tp->t_state&TS_XCLUDE && p->p_ucred->cr_uid != 0)
-               return (EBUSY);
+       } else if (tp->t_state&TS_XCLUDE && suser(kauth_cred_get(), NULL)) {
+               error = EBUSY;
+               goto out;
+       }
        if (tp->t_oproc)                        /* Ctrlr still around. */
                (void)(*linesw[tp->t_line].l_modem)(tp, 1);
        while ((tp->t_state & TS_CARR_ON) == 0) {
@@ -282,60 +221,91 @@ ptsopen(dev, flag, devtype, p)
                error = ttysleep(tp, TSA_CARR_ON(tp), TTIPRI | PCATCH,
                                 "ptsopn", 0);
                if (error)
-                       return (error);
+                       goto out;
        }
        error = (*linesw[tp->t_line].l_open)(dev, tp);
        if (error == 0)
                ptcwakeup(tp, FREAD|FWRITE);
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
        return (error);
 }
 
-FREE_BSDSTATIC int
-ptsclose(dev, flag, mode, p)
-       dev_t dev;
-       int flag, mode;
-       struct proc *p;
+__private_extern__ int
+ptsclose(dev_t dev, int flag, __unused int mode, __unused proc_t p)
 {
-       register struct tty *tp;
+       struct tty *tp;
        int err;
+       boolean_t   funnel_state;
+       /*
+        * This is temporary until the VSX conformance tests
+        * are fixed.  They are hanging with a deadlock
+        * where close(pts) will not complete without t_timeout set
+        */
+#define        FIX_VSX_HANG    1
+#ifdef FIX_VSX_HANG
+       int save_timeout;
+#endif
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        tp = pt_tty[minor(dev)];
+#ifdef FIX_VSX_HANG
+       save_timeout = tp->t_timeout;
+       tp->t_timeout = 60;
+#endif
        err = (*linesw[tp->t_line].l_close)(tp, flag);
        ptsstop(tp, FREAD|FWRITE);
        (void) ttyclose(tp);
+#ifdef FIX_VSX_HANG
+       tp->t_timeout = save_timeout;
+#endif
+       (void) thread_funnel_set(kernel_flock, funnel_state);
        return (err);
 }
 
-FREE_BSDSTATIC int
-ptsread(dev, uio, flag)
-       dev_t dev;
-       struct uio *uio;
-       int flag;
+__private_extern__ int
+ptsread(dev_t dev, struct uio *uio, int flag)
 {
-#ifndef NeXT
-       struct proc *p = curproc;
-#else
        struct proc *p = current_proc();
-#endif /* NeXT */
-       register struct tty *tp = pt_tty[minor(dev)];
-       register struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
+       struct tty *tp = pt_tty[minor(dev)];
+       struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        int error = 0;
        struct uthread *ut;
+       boolean_t   funnel_state;
+       struct pgrp *pg;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
-       ut = (struct uthread *)get_bsdthread_info(current_act());
+
+       ut = (struct uthread *)get_bsdthread_info(current_thread());
 again:
        if (pti->pt_flags & PF_REMOTE) {
                while (isbackground(p, tp)) {
                        if ((p->p_sigignore & sigmask(SIGTTIN)) ||
                            (ut->uu_sigmask & sigmask(SIGTTIN)) ||
-                           p->p_pgrp->pg_jobc == 0 ||
-                           p->p_flag & P_PPWAIT)
-                               return (EIO);
-                       pgsignal(p->p_pgrp, SIGTTIN, 1);
+                           p->p_lflag & P_LPPWAIT) {
+                               error = EIO;
+                               goto out;
+                       }
+
+
+                       pg = proc_pgrp(p);
+                       if (pg == PGRP_NULL) {
+                               error = EIO;
+                               goto out;
+                       }
+                       if (pg->pg_jobc == 0) {
+                               pg_rele(pg);
+                               error = EIO;
+                               goto out;
+                       }
+                       pgsignal(pg, SIGTTIN, 1);
+                       pg_rele(pg);
+
                        error = ttysleep(tp, &lbolt, TTIPRI | PCATCH | PTTYBLOCK, "ptsbg",
                                         0);
                        if (error)
-                               return (error);
+                               goto out;
                }
                if (tp->t_canq.c_cc == 0) {
                        if (flag & IO_NDELAY)
@@ -343,22 +313,31 @@ again:
                        error = ttysleep(tp, TSA_PTS_READ(tp), TTIPRI | PCATCH,
                                         "ptsin", 0);
                        if (error)
-                               return (error);
+                               goto out;
                        goto again;
                }
-               while (tp->t_canq.c_cc > 1 && uio->uio_resid > 0)
-                       if (ureadc(getc(&tp->t_canq), uio) < 0) {
-                               error = EFAULT;
+               while (tp->t_canq.c_cc > 1 && uio_resid(uio) > 0) {
+                       int cc;
+                       char buf[BUFSIZ];
+
+                       cc = min(uio_resid(uio), BUFSIZ);
+                       // Don't copy the very last byte
+                       cc = min(cc, tp->t_canq.c_cc - 1);
+                       cc = q_to_b(&tp->t_canq, (u_char *)buf, cc);
+                       error = uiomove(buf, cc, uio);
+                       if (error)
                                break;
-                       }
+               }
                if (tp->t_canq.c_cc == 1)
                        (void) getc(&tp->t_canq);
                if (tp->t_canq.c_cc)
-                       return (error);
+                       goto out;
        } else
                if (tp->t_oproc)
                        error = (*linesw[tp->t_line].l_read)(tp, uio, flag);
        ptcwakeup(tp, FWRITE);
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
        return (error);
 }
 
@@ -367,18 +346,23 @@ again:
  * Wakeups of controlling tty will happen
  * indirectly, when tty driver calls ptsstart.
  */
-FREE_BSDSTATIC int
-ptswrite(dev, uio, flag)
-       dev_t dev;
-       struct uio *uio;
-       int flag;
+__private_extern__ int
+ptswrite(dev_t dev, struct uio *uio, int flag)
 {
-       register struct tty *tp;
+       struct tty *tp;
+       int error;
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        tp = pt_tty[minor(dev)];
        if (tp->t_oproc == 0)
-               return (EIO);
-       return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
+               error = EIO;
+       else
+               error = (*linesw[tp->t_line].l_write)(tp, uio, flag);
+
+       (void) thread_funnel_set(kernel_flock, funnel_state);
+       return (error);
 }
 
 /*
@@ -386,26 +370,32 @@ ptswrite(dev, uio, flag)
  * Wake up process selecting or sleeping for input from controlling tty.
  */
 static void
-ptsstart(tp)
-       struct tty *tp;
+ptsstart(struct tty *tp)
 {
-       register struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
+       struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        if (tp->t_state & TS_TTSTOP)
-               return;
+               goto out;
        if (pti->pt_flags & PF_STOPPED) {
                pti->pt_flags &= ~PF_STOPPED;
                pti->pt_send = TIOCPKT_START;
        }
        ptcwakeup(tp, FREAD);
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
+       return;
 }
 
 static void
-ptcwakeup(tp, flag)
-       struct tty *tp;
-       int flag;
+ptcwakeup(struct tty *tp, int flag)
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        if (flag & FREAD) {
                selwakeup(&pti->pt_selr);
@@ -415,26 +405,34 @@ ptcwakeup(tp, flag)
                selwakeup(&pti->pt_selw);
                wakeup(TSA_PTC_WRITE(tp));
        }
+       (void) thread_funnel_set(kernel_flock, funnel_state);
 }
 
-FREE_BSDSTATIC int
-ptcopen(dev, flag, devtype, p)
-       dev_t dev;
-       int flag, devtype;
-       struct proc *p;
+__private_extern__ int
+ptcopen(dev_t dev, __unused int flag, __unused int devtype, __unused proc_t p)
 {
-       register struct tty *tp;
+       struct tty *tp;
        struct pt_ioctl *pti;
+       int error = 0;
+       boolean_t   funnel_state;
 
-       if (minor(dev) >= npty)
-               return (ENXIO);
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
+
+       if (minor(dev) >= npty) {
+               error = ENXIO;
+               goto out;
+       }
        if(!pt_tty[minor(dev)]) {
                tp = pt_tty[minor(dev)] = ttymalloc();
        } else
                tp = pt_tty[minor(dev)];
-       if (tp->t_oproc)
-               return (EIO);
+       /* If master is open OR slave is still draining, pty is still busy */
+       if (tp->t_oproc || (tp->t_state & TS_ISOPEN)) {
+               error = EBUSY;
+               goto out;
+       }
        tp->t_oproc = ptsstart;
+       CLR(tp->t_state, TS_ZOMBIE);
 #ifdef sun4c
        tp->t_stop = ptsstop;
 #endif
@@ -444,17 +442,18 @@ ptcopen(dev, flag, devtype, p)
        pti->pt_flags = 0;
        pti->pt_send = 0;
        pti->pt_ucntl = 0;
-       return (0);
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
+       return (error);
 }
 
-FREE_BSDSTATIC int
-ptcclose(dev, flags, fmt, p)
-       dev_t dev;
-       int flags;
-       int fmt;
-       struct proc *p;
+__private_extern__ int
+ptcclose(dev_t dev, __unused int flags, __unused int fmt, __unused proc_t p)
 {
-       register struct tty *tp;
+       struct tty *tp;
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        tp = pt_tty[minor(dev)];
        (void)(*linesw[tp->t_line].l_modem)(tp, 0);
@@ -474,19 +473,21 @@ ptcclose(dev, flags, fmt, p)
        }
 
        tp->t_oproc = 0;                /* mark closed */
+
+       (void) thread_funnel_set(kernel_flock, funnel_state);
        return (0);
 }
 
-FREE_BSDSTATIC int
-ptcread(dev, uio, flag)
-       dev_t dev;
-       struct uio *uio;
-       int flag;
+__private_extern__ int
+ptcread(dev_t dev, struct uio *uio, int flag)
 {
-       register struct tty *tp = pt_tty[minor(dev)];
+       struct tty *tp = pt_tty[minor(dev)];
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        char buf[BUFSIZ];
        int error = 0, cc;
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        /*
         * We want to block until the slave
@@ -499,53 +500,59 @@ ptcread(dev, uio, flag)
                        if (pti->pt_flags&PF_PKT && pti->pt_send) {
                                error = ureadc((int)pti->pt_send, uio);
                                if (error)
-                                       return (error);
+                                       goto out;
                                if (pti->pt_send & TIOCPKT_IOCTL) {
-                                       cc = min(uio->uio_resid,
+                                       cc = min(uio_resid(uio),
                                                sizeof(tp->t_termios));
                                        uiomove((caddr_t)&tp->t_termios, cc,
                                                uio);
                                }
                                pti->pt_send = 0;
-                               return (0);
+                               goto out;
                        }
                        if (pti->pt_flags&PF_UCNTL && pti->pt_ucntl) {
                                error = ureadc((int)pti->pt_ucntl, uio);
                                if (error)
-                                       return (error);
+                                       goto out;
                                pti->pt_ucntl = 0;
-                               return (0);
+                               goto out;
                        }
                        if (tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0)
                                break;
                }
                if ((tp->t_state & TS_CONNECTED) == 0)
-                       return (0);     /* EOF */
-               if (flag & IO_NDELAY)
-                       return (EWOULDBLOCK);
+                       goto out;       /* EOF */
+               if (flag & IO_NDELAY) {
+                       error = EWOULDBLOCK;
+                       goto out;
+               }
                error = tsleep(TSA_PTC_READ(tp), TTIPRI | PCATCH, "ptcin", 0);
                if (error)
-                       return (error);
+                       goto out;
        }
        if (pti->pt_flags & (PF_PKT|PF_UCNTL))
                error = ureadc(0, uio);
-       while (uio->uio_resid > 0 && error == 0) {
-               cc = q_to_b(&tp->t_outq, buf, min(uio->uio_resid, BUFSIZ));
+       while (uio_resid(uio) > 0 && error == 0) {
+               cc = q_to_b(&tp->t_outq, (u_char *)buf, min(uio_resid(uio), BUFSIZ));
                if (cc <= 0)
                        break;
                error = uiomove(buf, cc, uio);
        }
-       ttwwakeup(tp);
+       (*linesw[tp->t_line].l_start)(tp);
+
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
        return (error);
 }
 
-FREE_BSDSTATIC void
-ptsstop(tp, flush)
-       register struct tty *tp;
-       int flush;
+__private_extern__ void
+ptsstop(struct tty *tp, int flush)
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
        int flag;
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        /* note: FLUSHREAD and FLUSHWRITE already ok */
        if (flush == 0) {
@@ -561,41 +568,44 @@ ptsstop(tp, flush)
        if (flush & FWRITE)
                flag |= FREAD;
        ptcwakeup(tp, flag);
+
+       (void) thread_funnel_set(kernel_flock, funnel_state);
 }
 
-FREE_BSDSTATIC int
-ptcselect(dev, rw, wql, p)
-       dev_t dev;
-       int rw;
-       void * wql;
-       struct proc *p;
+__private_extern__ int
+ptcselect(dev_t dev, int rw, void *wql, struct proc *p)
 {
-       register struct tty *tp = pt_tty[minor(dev)];
+       struct tty *tp = pt_tty[minor(dev)];
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
-       int s;
+       int retval = 0;
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
-       if ((tp->t_state & TS_CONNECTED) == 0)
-               return (1);
+       if ((tp->t_state & TS_CONNECTED) == 0) {
+               retval = 1;
+               goto out;
+       }
        switch (rw) {
 
        case FREAD:
                /*
                 * Need to block timeouts (ttrstart).
                 */
-               s = spltty();
                if ((tp->t_state&TS_ISOPEN) &&
                     tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0) {
-                       splx(s);
-                       return (1);
+                       retval = 1;
+                       goto out;
                }
-               splx(s);
                /* FALLTHROUGH */
 
        case 0:                                 /* exceptional */
                if ((tp->t_state&TS_ISOPEN) &&
                    ((pti->pt_flags&PF_PKT && pti->pt_send) ||
-                    (pti->pt_flags&PF_UCNTL && pti->pt_ucntl)))
-                       return (1);
+                    (pti->pt_flags&PF_UCNTL && pti->pt_ucntl))) {
+                       retval = 1;
+                       goto out;
+               }
                selrecord(p, &pti->pt_selr, wql);
                break;
 
@@ -603,35 +613,43 @@ ptcselect(dev, rw, wql, p)
        case FWRITE:
                if (tp->t_state&TS_ISOPEN) {
                        if (pti->pt_flags & PF_REMOTE) {
-                           if (tp->t_canq.c_cc == 0)
-                               return (1);
+                           if (tp->t_canq.c_cc == 0) {
+                               retval = 1;
+                               goto out;
+                           }
                        } else {
-                           if (tp->t_rawq.c_cc + tp->t_canq.c_cc < TTYHOG-2)
-                                   return (1);
-                           if (tp->t_canq.c_cc == 0 && (tp->t_iflag&ICANON))
-                                   return (1);
+                           if (tp->t_rawq.c_cc + tp->t_canq.c_cc < TTYHOG-2) {
+                                   retval = 1;
+                                   goto out;
+                           }
+                           if (tp->t_canq.c_cc == 0 && (tp->t_lflag&ICANON)) {
+                                   retval = 1;
+                                   goto out;
+                           }
                        }
                }
                selrecord(p, &pti->pt_selw, wql);
                break;
 
        }
-       return (0);
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
+       return (retval);
 }
 
-FREE_BSDSTATIC int
-ptcwrite(dev, uio, flag)
-       dev_t dev;
-       register struct uio *uio;
-       int flag;
+__private_extern__ int
+ptcwrite(dev_t dev, struct uio *uio, int flag)
 {
-       register struct tty *tp = pt_tty[minor(dev)];
-       register u_char *cp = NULL;
-       register int cc = 0;
+       struct tty *tp = pt_tty[minor(dev)];
+       u_char *cp = NULL;
+       int cc = 0;
        u_char locbuf[BUFSIZ];
-       int cnt = 0;
+       int wcnt = 0;
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        int error = 0;
+       boolean_t   funnel_state;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
 again:
        if ((tp->t_state&TS_ISOPEN) == 0)
@@ -639,24 +657,25 @@ again:
        if (pti->pt_flags & PF_REMOTE) {
                if (tp->t_canq.c_cc)
                        goto block;
-               while ((uio->uio_resid > 0 || cc > 0) &&
+               while ((uio_resid(uio) > 0 || cc > 0) &&
                       tp->t_canq.c_cc < TTYHOG - 1) {
                        if (cc == 0) {
-                               cc = min(uio->uio_resid, BUFSIZ);
+                               cc = min(uio_resid(uio), BUFSIZ);
                                cc = min(cc, TTYHOG - 1 - tp->t_canq.c_cc);
                                cp = locbuf;
                                error = uiomove((caddr_t)cp, cc, uio);
                                if (error)
-                                       return (error);
+                                       goto out;
                                /* check again for safety */
                                if ((tp->t_state & TS_ISOPEN) == 0) {
                                        /* adjust as usual */
-                                       uio->uio_resid += cc;
-                                       return (EIO);
+                                       uio_setresid(uio, (uio_resid(uio) + cc));
+                                       error = EIO;
+                                       goto out;
                                }
                        }
                        if (cc > 0) {
-                               cc = b_to_q((char *)cp, cc, &tp->t_canq);
+                               cc = b_to_q((u_char *)cp, cc, &tp->t_canq);
                                /*
                                 * XXX we don't guarantee that the canq size
                                 * is >= TTYHOG, so the above b_to_q() may
@@ -670,39 +689,42 @@ again:
                        }
                }
                /* adjust for data copied in but not written */
-               uio->uio_resid += cc;
+               uio_setresid(uio, (uio_resid(uio) + cc));
                (void) putc(0, &tp->t_canq);
                ttwakeup(tp);
                wakeup(TSA_PTS_READ(tp));
-               return (0);
+               goto out;
        }
-       while (uio->uio_resid > 0 || cc > 0) {
+       while (uio_resid(uio) > 0 || cc > 0) {
                if (cc == 0) {
-                       cc = min(uio->uio_resid, BUFSIZ);
+                       cc = min(uio_resid(uio), BUFSIZ);
                        cp = locbuf;
                        error = uiomove((caddr_t)cp, cc, uio);
                        if (error)
-                               return (error);
+                               goto out;
                        /* check again for safety */
                        if ((tp->t_state & TS_ISOPEN) == 0) {
                                /* adjust for data copied in but not written */
-                               uio->uio_resid += cc;
-                               return (EIO);
+                               uio_setresid(uio, (uio_resid(uio) + cc));
+                               error = EIO;
+                               goto out;
                        }
                }
                while (cc > 0) {
                        if ((tp->t_rawq.c_cc + tp->t_canq.c_cc) >= TTYHOG - 2 &&
-                          (tp->t_canq.c_cc > 0 || !(tp->t_iflag&ICANON))) {
+                          (tp->t_canq.c_cc > 0 || !(tp->t_lflag&ICANON))) {
                                wakeup(TSA_HUP_OR_INPUT(tp));
                                goto block;
                        }
                        (*linesw[tp->t_line].l_rint)(*cp++, tp);
-                       cnt++;
+                       wcnt++;
                        cc--;
                }
                cc = 0;
        }
-       return (0);
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
+       return (error);
 block:
        /*
         * Come here to wait for slave to open, for space
@@ -710,60 +732,36 @@ block:
         */
        if ((tp->t_state & TS_CONNECTED) == 0) {
                /* adjust for data copied in but not written */
-               uio->uio_resid += cc;
-               return (EIO);
+               uio_setresid(uio, (uio_resid(uio) + cc));
+               error = EIO;
+               goto out;
        }
        if (flag & IO_NDELAY) {
                /* adjust for data copied in but not written */
-               uio->uio_resid += cc;
-               if (cnt == 0)
-                       return (EWOULDBLOCK);
-               return (0);
+               uio_setresid(uio, (uio_resid(uio) + cc));
+               if (wcnt == 0)
+                       error = EWOULDBLOCK;
+               goto out;
        }
        error = tsleep(TSA_PTC_WRITE(tp), TTOPRI | PCATCH, "ptcout", 0);
        if (error) {
                /* adjust for data copied in but not written */
-               uio->uio_resid += cc;
-               return (error);
+               uio_setresid(uio, (uio_resid(uio) + cc));
+               goto out;
        }
        goto again;
 }
 
-#ifndef NeXT
-/* XXX we eventually want to go to this model,
- * but premier can't change the cdevsw */
-static struct tty *
-ptydevtotty(dev)
-       dev_t           dev;
+__private_extern__ int
+ptyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
-       if (minor(dev) >= npty)
-               return (NULL);
+       struct tty *tp = pt_tty[minor(dev)];
+       struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
+       u_char *cc = tp->t_cc;
+       int stop, error = 0;
+       boolean_t   funnel_state;
 
-       return &pt_tty[minor(dev)];
-}
-#endif /* !NeXT */
-
-/*ARGSUSED*/
-FREE_BSDSTATIC int
-#ifndef NeXT
-ptyioctl(dev, cmd, data, flag)
-       dev_t dev;
-       int cmd;
-       caddr_t data;
-       int flag;
-#else
-ptyioctl(dev, cmd, data, flag, p)
-       dev_t dev;
-       u_long cmd;
-       caddr_t data;
-       int flag;
-       struct proc *p;
-#endif
-{
-       register struct tty *tp = pt_tty[minor(dev)];
-       register struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
-       register u_char *cc = tp->t_cc;
-       int stop, error;
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        /*
         * IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG.
@@ -789,13 +787,9 @@ ptyioctl(dev, cmd, data, flag, p)
                        }
                        tp->t_lflag &= ~EXTPROC;
                }
-               return(0);
+               goto out;
        } else
-#ifndef NeXT
-       if (cdevsw[major(dev)]->d_open == ptcopen)
-#else
        if (cdevsw[major(dev)].d_open == ptcopen)
-#endif
                switch (cmd) {
 
                case TIOCGPGRP:
@@ -804,25 +798,29 @@ ptyioctl(dev, cmd, data, flag, p)
                         * in that case, tp must be the controlling terminal.
                         */
                        *(int *)data = tp->t_pgrp ? tp->t_pgrp->pg_id : 0;
-                       return (0);
+                       goto out;
 
                case TIOCPKT:
                        if (*(int *)data) {
-                               if (pti->pt_flags & PF_UCNTL)
-                                       return (EINVAL);
+                               if (pti->pt_flags & PF_UCNTL) {
+                                       error = EINVAL;
+                                       goto out;
+                               }
                                pti->pt_flags |= PF_PKT;
                        } else
                                pti->pt_flags &= ~PF_PKT;
-                       return (0);
+                       goto out;
 
                case TIOCUCNTL:
                        if (*(int *)data) {
-                               if (pti->pt_flags & PF_PKT)
-                                       return (EINVAL);
+                               if (pti->pt_flags & PF_PKT) {
+                                       error = EINVAL;
+                                       goto out;
+                               }
                                pti->pt_flags |= PF_UCNTL;
                        } else
                                pti->pt_flags &= ~PF_UCNTL;
-                       return (0);
+                       goto out;
 
                case TIOCREMOTE:
                        if (*(int *)data)
@@ -830,9 +828,9 @@ ptyioctl(dev, cmd, data, flag, p)
                        else
                                pti->pt_flags &= ~PF_REMOTE;
                        ttyflush(tp, FREAD|FWRITE);
-                       return (0);
+                       goto out;
 
-#ifdef COMPAT_43
+#if COMPAT_43_TTY
                case TIOCSETP:
                case TIOCSETN:
 #endif
@@ -845,30 +843,75 @@ ptyioctl(dev, cmd, data, flag, p)
 
                case TIOCSIG:
                        if (*(unsigned int *)data >= NSIG ||
-                           *(unsigned int *)data == 0)
-                               return(EINVAL);
+                           *(unsigned int *)data == 0) {
+                               error = EINVAL;
+                               goto out;
+                       }
                        if ((tp->t_lflag&NOFLSH) == 0)
                                ttyflush(tp, FREAD|FWRITE);
-                       pgsignal(tp->t_pgrp, *(unsigned int *)data, 1);
+                       tty_pgsignal(tp, *(unsigned int *)data, 1);
                        if ((*(unsigned int *)data == SIGINFO) &&
                            ((tp->t_lflag&NOKERNINFO) == 0))
                                ttyinfo(tp);
-                       return(0);
+                       goto out;
+
+               case TIOCPTYGRANT:      /* grantpt(3) */
+                       /*
+                        * Change the uid of the slave to that of the calling
+                        * thread, change the gid of the slave to GID_TTY,
+                        * change the mode to 0620 (rw--w----).
+                        */
+                       {
+                               _devfs_setattr(pti->pt_devhandle, 0620, kauth_getuid(), GID_TTY);
+                               goto out;
+                       }
+
+               case TIOCPTYGNAME:      /* ptsname(3) */
+                       /*
+                        * Report the name of the slave device in *data
+                        * (128 bytes max.).  Use the same derivation method
+                        * used for calling devfs_make_node() to create it.
+                        */
+                       snprintf(data, 128, "/dev/tty%c%x",
+                               START_CHAR + (minor(dev) / HEX_BASE),
+                               minor(dev) % HEX_BASE);
+                       error = 0;
+                       goto out;
+               
+               case TIOCPTYUNLK:       /* unlockpt(3) */
+                       /*
+                        * Unlock the slave device so that it can be opened.
+                        */
+                       error = 0;
+                       goto out;
                }
        error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
-       if (error < 0)
-                error = ttioctl(tp, cmd, data, flag, p);
-       if (error < 0) {
-               if (pti->pt_flags & PF_UCNTL &&
-                   (cmd & ~0xff) == UIOCCMD(0)) {
-                       if (cmd & 0xff) {
-                               pti->pt_ucntl = (u_char)cmd;
-                               ptcwakeup(tp, FREAD);
+       if (error == ENOTTY) {
+               error = ttioctl(tp, cmd, data, flag, p);
+               if (error == ENOTTY) {
+                       if (pti->pt_flags & PF_UCNTL && (cmd & ~0xff) == UIOCCMD(0)) {
+                               /* Process the UIOCMD ioctl group */
+                               if (cmd & 0xff) {
+                                       pti->pt_ucntl = (u_char)cmd;
+                                       ptcwakeup(tp, FREAD);
+                               }
+                               error = 0;
+                               goto out;
+                       } else if (cmd == TIOCSBRK || cmd == TIOCCBRK) {
+                               /*
+                                * POSIX conformance; rdar://3936338
+                                *
+                                * Clear ENOTTY in the case of setting or
+                                * clearing a break failing because pty's
+                                * don't support break like real serial
+                                * ports.
+                                */
+                               error = 0;
+                               goto out;
                        }
-                       return (0);
                }
-               error = ENOTTY;
        }
+
        /*
         * If external processing and packet mode send ioctl packet.
         */
@@ -877,11 +920,11 @@ ptyioctl(dev, cmd, data, flag, p)
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:
-#ifdef COMPAT_43
+#if COMPAT_43_TTY
                case TIOCSETP:
                case TIOCSETN:
 #endif
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if COMPAT_43_TTY || defined(COMPAT_SUNOS)
                case TIOCSETC:
                case TIOCSLTC:
                case TIOCLBIS:
@@ -911,42 +954,7 @@ ptyioctl(dev, cmd, data, flag, p)
                        ptcwakeup(tp, FREAD);
                }
        }
+out:
+       (void) thread_funnel_set(kernel_flock, funnel_state);
        return (error);
 }
-
-#ifndef NeXT
-static ptc_devsw_installed = 0;
-
-static void
-ptc_drvinit(void *unused)
-{
-#ifdef DEVFS
-       int i,j,k;
-#endif
-       dev_t dev;
-
-       if( ! ptc_devsw_installed ) {
-               dev = makedev(CDEV_MAJOR_S, 0);
-               cdevsw_add(&dev, &pts_cdevsw, NULL);
-               dev = makedev(CDEV_MAJOR_C, 0);
-               cdevsw_add(&dev, &ptc_cdevsw, NULL);
-               ptc_devsw_installed = 1;
-#ifdef DEVFS
-               for ( i = 0 ; i<NPTY ; i++ ) {
-                       j = i / 32;
-                       k = i % 32;
-                       devfs_token_pts[i] = 
-                               devfs_add_devswf(&pts_cdevsw,i,
-                                               DV_CHR,0,0,0666,
-                                               "tty%c%n",jnames[j],k);
-                       devfs_token_ptc[i] =
-                               devfs_add_devswf(&ptc_cdevsw,i,
-                                               DV_CHR,0,0,0666,
-                                               "pty%c%n",jnames[j],k);
-               }
-#endif
-       }
-}
-
-SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL)
-#endif /* !NeXT */