add memory filesystem initialization

[unix-history] / usr / src / sys / kern / sys_generic.c

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index 6bd9470..27ba545 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,15 +1,35 @@
-/*     sys_generic.c   6.2     84/07/08        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/file.h"
-#include "../h/proc.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
-#include "../h/stat.h"
+/*
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)sys_generic.c       7.12 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "systm.h"
+#include "syscontext.h"
+#include "ioctl.h"
+#include "file.h"
+#include "proc.h"
+#include "uio.h"
+#include "kernel.h"
+#include "stat.h"
+#include "malloc.h"
+#ifdef KTRACE
+#include "ktrace.h"
+#endif

 
 /*
  * Read system call.
 
 /*
  * Read system call.


@@ -21,14 +41,51 @@ read()
                char    *cbuf;
                unsigned count;
        } *uap = (struct a *)u.u_ap;
                char    *cbuf;
                unsigned count;
        } *uap = (struct a *)u.u_ap;

+       register struct file *fp;

        struct uio auio;
        struct iovec aiov;
        struct uio auio;
        struct iovec aiov;

+       long cnt, error = 0;
+#ifdef KTRACE
+       struct iovec ktriov;
+#endif

 
 

+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FREAD) == 0)
+               RETURN (EBADF);
+       if (uap->count < 0)
+               RETURN (EINVAL);

        aiov.iov_base = (caddr_t)uap->cbuf;
        aiov.iov_len = uap->count;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;
        aiov.iov_base = (caddr_t)uap->cbuf;
        aiov.iov_len = uap->count;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;

-       rwuio(&auio, UIO_READ);
+       auio.uio_resid = uap->count;
+       auio.uio_rw = UIO_READ;
+       auio.uio_segflg = UIO_USERSPACE;
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(u.u_procp, KTR_GENIO))
+               ktriov = aiov;
+#endif
+       cnt = uap->count;
+       if (setjmp(&u.u_qsave)) {
+               if (auio.uio_resid == cnt) {
+                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
+                               error = EINTR;
+                       else
+                               u.u_eosys = RESTARTSYS;
+               }
+       } else
+               error = (*fp->f_ops->fo_read)(fp, &auio, fp->f_cred);
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (KTRPOINT(u.u_procp, KTR_GENIO))
+               ktrgenio(u.u_procp->p_tracep, uap->fdes, UIO_READ, &ktriov, cnt);
+#endif
+       u.u_r.r_val1 = cnt;
+       RETURN (error);

 }
 
 readv()
 }
 
 readv()


@@ -36,22 +93,81 @@ readv()
        register struct a {
                int     fdes;
                struct  iovec *iovp;
        register struct a {
                int     fdes;
                struct  iovec *iovp;

-               int     iovcnt;
+               unsigned iovcnt;

        } *uap = (struct a *)u.u_ap;
        } *uap = (struct a *)u.u_ap;

+       register struct file *fp;

        struct uio auio;
        struct uio auio;

-       struct iovec aiov[16];          /* XXX */
+       register struct iovec *iov;
+       struct iovec aiov[UIO_SMALLIOV];
+       long i, cnt, error = 0;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif

 
 

-       if (uap->iovcnt <= 0 || uap->iovcnt > sizeof(aiov)/sizeof(aiov[0])) {
-               u.u_error = EINVAL;
-               return;
-       }
-       auio.uio_iov = aiov;
+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FREAD) == 0)
+               RETURN (EBADF);
+       if (uap->iovcnt > UIO_SMALLIOV) {
+               if (uap->iovcnt > UIO_MAXIOV)
+                       RETURN (EINVAL);
+               MALLOC(iov, struct iovec *, 
+                     sizeof(struct iovec) * uap->iovcnt, M_IOV, M_WAITOK);
+       } else
+               iov = aiov;
+       auio.uio_iov = iov;

        auio.uio_iovcnt = uap->iovcnt;
        auio.uio_iovcnt = uap->iovcnt;

-       u.u_error = copyin((caddr_t)uap->iovp, (caddr_t)aiov,
-           (unsigned)(uap->iovcnt * sizeof (struct iovec)));
-       if (u.u_error)
-               return;
-       rwuio(&auio, UIO_READ);
+       auio.uio_rw = UIO_READ;
+       auio.uio_segflg = UIO_USERSPACE;
+       if (error = copyin((caddr_t)uap->iovp, (caddr_t)iov,
+           uap->iovcnt * sizeof (struct iovec)))
+               goto done;
+       auio.uio_resid = 0;
+       for (i = 0; i < uap->iovcnt; i++) {
+               if (iov->iov_len < 0) {
+                       error = EINVAL;
+                       goto done;
+               }
+               auio.uio_resid += iov->iov_len;
+               if (auio.uio_resid < 0) {
+                       error = EINVAL;
+                       goto done;
+               }
+               iov++;
+       }
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(u.u_procp, KTR_GENIO))  {
+               int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
+
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
+       }
+#endif
+       cnt = auio.uio_resid;
+       if (setjmp(&u.u_qsave)) {
+               if (auio.uio_resid == cnt) {
+                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
+                               error = EINTR;
+                       else
+                               u.u_eosys = RESTARTSYS;
+               }
+       } else
+               error = (*fp->f_ops->fo_read)(fp, &auio, fp->f_cred);
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               ktrgenio(u.u_procp->p_tracep, uap->fdes, UIO_READ, ktriov, cnt);
+               FREE(ktriov, M_TEMP);
+       }
+#endif
+       u.u_r.r_val1 = cnt;
+done:
+       if (uap->iovcnt > UIO_SMALLIOV)
+               FREE(iov, M_IOV);
+       RETURN (error);

 }
 
 /*
 }
 
 /*


@@ -62,16 +178,54 @@ write()
        register struct a {
                int     fdes;
                char    *cbuf;
        register struct a {
                int     fdes;
                char    *cbuf;

-               int     count;
+               unsigned count;

        } *uap = (struct a *)u.u_ap;
        } *uap = (struct a *)u.u_ap;

+       register struct file *fp;

        struct uio auio;
        struct iovec aiov;
        struct uio auio;
        struct iovec aiov;

+       long cnt, error = 0;
+#ifdef KTRACE
+       struct iovec ktriov;
+#endif

 
 

+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FWRITE) == 0)
+               RETURN (EBADF);
+       if (uap->count < 0)
+               RETURN (EINVAL);
+       aiov.iov_base = (caddr_t)uap->cbuf;
+       aiov.iov_len = uap->count;

        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;
        auio.uio_iov = &aiov;
        auio.uio_iovcnt = 1;

-       aiov.iov_base = uap->cbuf;
-       aiov.iov_len = uap->count;
-       rwuio(&auio, UIO_WRITE);
+       auio.uio_resid = uap->count;
+       auio.uio_rw = UIO_WRITE;
+       auio.uio_segflg = UIO_USERSPACE;
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(u.u_procp, KTR_GENIO))
+               ktriov = aiov;
+#endif
+       cnt = uap->count;
+       if (setjmp(&u.u_qsave)) {
+               if (auio.uio_resid == cnt) {
+                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
+                               error = EINTR;
+                       else
+                               u.u_eosys = RESTARTSYS;
+               }
+       } else
+               error = (*fp->f_ops->fo_write)(fp, &auio, fp->f_cred);
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (KTRPOINT(u.u_procp, KTR_GENIO))
+               ktrgenio(u.u_procp->p_tracep, uap->fdes, UIO_WRITE,
+                   &ktriov, cnt);
+#endif
+       u.u_r.r_val1 = cnt;
+       RETURN (error);

 }
 
 writev()
 }
 
 writev()


@@ -79,64 +233,82 @@ writev()
        register struct a {
                int     fdes;
                struct  iovec *iovp;
        register struct a {
                int     fdes;
                struct  iovec *iovp;

-               int     iovcnt;
+               unsigned iovcnt;

        } *uap = (struct a *)u.u_ap;
        } *uap = (struct a *)u.u_ap;

-       struct uio auio;
-       struct iovec aiov[16];          /* XXX */
-
-       if (uap->iovcnt <= 0 || uap->iovcnt > sizeof(aiov)/sizeof(aiov[0])) {
-               u.u_error = EINVAL;
-               return;
-       }
-       auio.uio_iov = aiov;
-       auio.uio_iovcnt = uap->iovcnt;
-       u.u_error = copyin((caddr_t)uap->iovp, (caddr_t)aiov,
-           (unsigned)(uap->iovcnt * sizeof (struct iovec)));
-       if (u.u_error)
-               return;
-       rwuio(&auio, UIO_WRITE);
-}
-
-rwuio(uio, rw)
-       register struct uio *uio;
-       enum uio_rw rw;
-{
-       struct a {
-               int     fdes;
-       };

        register struct file *fp;
        register struct file *fp;

+       struct uio auio;

        register struct iovec *iov;
        register struct iovec *iov;

-       int i, count;
+       struct iovec aiov[UIO_SMALLIOV];
+       long i, cnt, error = 0;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif

 
 

-       GETF(fp, ((struct a *)u.u_ap)->fdes);
-       if ((fp->f_flag&(rw==UIO_READ ? FREAD : FWRITE)) == 0) {
-               u.u_error = EBADF;
-               return;
-       }
-       uio->uio_resid = 0;
-       uio->uio_segflg = UIO_USERSPACE;
-       iov = uio->uio_iov;
-       for (i = 0; i < uio->uio_iovcnt; i++) {
+       if (((unsigned)uap->fdes) >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL ||
+           (fp->f_flag & FWRITE) == 0)
+               RETURN (EBADF);
+       if (uap->iovcnt > UIO_SMALLIOV) {
+               if (uap->iovcnt > UIO_MAXIOV)
+                       RETURN (EINVAL);
+               MALLOC(iov, struct iovec *, 
+                     sizeof(struct iovec) * uap->iovcnt, M_IOV, M_WAITOK);
+       } else
+               iov = aiov;
+       auio.uio_iov = iov;
+       auio.uio_iovcnt = uap->iovcnt;
+       auio.uio_rw = UIO_WRITE;
+       auio.uio_segflg = UIO_USERSPACE;
+       if (error = copyin((caddr_t)uap->iovp, (caddr_t)iov,
+           uap->iovcnt * sizeof (struct iovec)))
+               goto done;
+       auio.uio_resid = 0;
+       for (i = 0; i < uap->iovcnt; i++) {

                if (iov->iov_len < 0) {
                if (iov->iov_len < 0) {

-                       u.u_error = EINVAL;
-                       return;
+                       error = EINVAL;
+                       goto done;

                }
                }

-               uio->uio_resid += iov->iov_len;
-               if (uio->uio_resid < 0) {
-                       u.u_error = EINVAL;
-                       return;
+               auio.uio_resid += iov->iov_len;
+               if (auio.uio_resid < 0) {
+                       error = EINVAL;
+                       goto done;

                }
                iov++;
        }
                }
                iov++;
        }

-       count = uio->uio_resid;
-       uio->uio_offset = fp->f_offset;
-       if ((u.u_procp->p_flag&SOUSIG) == 0 && setjmp(&u.u_qsave)) {
-               if (uio->uio_resid == count)
-                       u.u_eosys = RESTARTSYS;
+#ifdef KTRACE
+       /*
+        * if tracing, save a copy of iovec
+        */
+       if (KTRPOINT(u.u_procp, KTR_GENIO))  {
+               int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
+
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
+       }
+#endif
+       cnt = auio.uio_resid;
+       if (setjmp(&u.u_qsave)) {
+               if (auio.uio_resid == cnt) {
+                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
+                               error = EINTR;
+                       else
+                               u.u_eosys = RESTARTSYS;
+               }

        } else
        } else

-               u.u_error = (*fp->f_ops->fo_rw)(fp, rw, uio);
-       u.u_r.r_val1 = count - uio->uio_resid;
-       fp->f_offset += u.u_r.r_val1;
+               error = (*fp->f_ops->fo_write)(fp, &auio, fp->f_cred);
+       cnt -= auio.uio_resid;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               ktrgenio(u.u_procp->p_tracep, uap->fdes, UIO_WRITE,
+                   ktriov, cnt);
+               FREE(ktriov, M_TEMP);
+       }
+#endif
+       u.u_r.r_val1 = cnt;
+done:
+       if (uap->iovcnt > UIO_SMALLIOV)
+               FREE(iov, M_IOV);
+       RETURN (error);

 }
 
 /*
 }
 
 /*


@@ -149,33 +321,23 @@ ioctl()
                int     fdes;
                int     cmd;
                caddr_t cmarg;
                int     fdes;
                int     cmd;
                caddr_t cmarg;

-       } *uap;
+       } *uap = (struct a *)u.u_ap;

        register int com;
        register u_int size;
        register int com;
        register u_int size;

-       char data[IOCPARM_MASK+1];
-
-       uap = (struct a *)u.u_ap;
-       if ((fp = getf(uap->fdes)) == NULL)
-               return;
+       caddr_t memp = 0;
+#define STK_PARAMS     128
+       char stkbuf[STK_PARAMS];
+       caddr_t data = stkbuf;
+
+       if ((unsigned)uap->fdes >= NOFILE ||
+           (fp = u.u_ofile[uap->fdes]) == NULL)
+               RETURN (EBADF);

        if ((fp->f_flag & (FREAD|FWRITE)) == 0) {
                u.u_error = EBADF;
                return;
        }
        com = uap->cmd;
 
        if ((fp->f_flag & (FREAD|FWRITE)) == 0) {
                u.u_error = EBADF;
                return;
        }
        com = uap->cmd;
 

-#if defined(vax) && defined(COMPAT)
-       /*
-        * Map old style ioctl's into new for the
-        * sake of backwards compatibility (sigh).
-        */
-       if ((com&~0xffff) == 0) {
-               com = mapioctl(com);
-               if (com == 0) {
-                       u.u_error = EINVAL;
-                       return;
-               }
-       }
-#endif

        if (com == FIOCLEX) {
                u.u_pofile[uap->fdes] |= UF_EXCLOSE;
                return;
        if (com == FIOCLEX) {
                u.u_pofile[uap->fdes] |= UF_EXCLOSE;
                return;


@@ -190,25 +352,32 @@ ioctl()
         * amount of data to be copied to/from the
         * user's address space.
         */
         * amount of data to be copied to/from the
         * user's address space.
         */

-       size = (com &~ (IOC_INOUT|IOC_VOID)) >> 16;
-       if (size > sizeof (data)) {
-               u.u_error = EFAULT;
+       size = IOCPARM_LEN(com);
+       if (size > IOCPARM_MAX) {
+               u.u_error = ENOTTY;

                return;
        }
                return;
        }

+       if (size > sizeof (stkbuf)) {
+               memp = (caddr_t)malloc((u_long)IOCPARM_LEN(com), M_IOCTLOPS,
+                   M_WAITOK);
+               data = memp;
+       }

        if (com&IOC_IN) {
                if (size) {
        if (com&IOC_IN) {
                if (size) {

-                       u.u_error =
-                           copyin(uap->cmarg, (caddr_t)data, (u_int)size);
-                       if (u.u_error)
+                       u.u_error = copyin(uap->cmarg, data, (u_int)size);
+                       if (u.u_error) {
+                               if (memp)
+                                       free(memp, M_IOCTLOPS);

                                return;
                                return;

+                       }

                } else
                        *(caddr_t *)data = uap->cmarg;
        } else if ((com&IOC_OUT) && size)
                /*
                } else
                        *(caddr_t *)data = uap->cmarg;
        } else if ((com&IOC_OUT) && size)
                /*

-                * Zero the buffer on the stack so the user
-                * always gets back something deterministic.
+                * Zero the buffer so the user always
+                * gets back something deterministic.

                 */
                 */

-               bzero((caddr_t)data, size);
+               bzero(data, size);

        else if (com&IOC_VOID)
                *(caddr_t *)data = uap->cmarg;
 
        else if (com&IOC_VOID)
                *(caddr_t *)data = uap->cmarg;
 


@@ -216,31 +385,39 @@ ioctl()
 
        case FIONBIO:
                u.u_error = fset(fp, FNDELAY, *(int *)data);
 
        case FIONBIO:
                u.u_error = fset(fp, FNDELAY, *(int *)data);

-               return;
+               break;

 
        case FIOASYNC:
                u.u_error = fset(fp, FASYNC, *(int *)data);
 
        case FIOASYNC:
                u.u_error = fset(fp, FASYNC, *(int *)data);

-               return;
+               break;

 
        case FIOSETOWN:
                u.u_error = fsetown(fp, *(int *)data);
 
        case FIOSETOWN:
                u.u_error = fsetown(fp, *(int *)data);

-               return;
+               break;

 
        case FIOGETOWN:
                u.u_error = fgetown(fp, (int *)data);
 
        case FIOGETOWN:
                u.u_error = fgetown(fp, (int *)data);

-               return;
+               break;
+       default:
+               if (setjmp(&u.u_qsave))
+                       u.u_error = EINTR;
+               else
+                       u.u_error = (*fp->f_ops->fo_ioctl)(fp, com, data);
+               /*
+                * Copy any data to user, size was
+                * already set and checked above.
+                */
+               if (u.u_error == 0 && (com&IOC_OUT) && size)
+                       u.u_error = copyout(data, uap->cmarg, (u_int)size);
+               break;

        }
        }

-       u.u_error = (*fp->f_ops->fo_ioctl)(fp, com, data);
-       /*
-        * Copy any data to user, size was
-        * already set and checked above.
-        */
-       if (u.u_error == 0 && (com&IOC_OUT) && size)
-               u.u_error = copyout(data, uap->cmarg, (u_int)size);
+       if (memp)
+               free(memp, M_IOCTLOPS);

 }
 
 int    unselect();
 int    nselcoll;
 }
 
 int    unselect();
 int    nselcoll;

+

 /*
  * Select system call.
  */
 /*
  * Select system call.
  */


@@ -248,28 +425,27 @@ select()
 {
        register struct uap  {
                int     nd;
 {
        register struct uap  {
                int     nd;

-               long    *in, *ou, *ex;
+               fd_set  *in, *ou, *ex;

                struct  timeval *tv;
        } *uap = (struct uap *)u.u_ap;
                struct  timeval *tv;
        } *uap = (struct uap *)u.u_ap;

-       int ibits[3], obits[3];
+       fd_set ibits[3], obits[3];

        struct timeval atv;
        struct timeval atv;

-       int s, ncoll, mask;
+       int s, ncoll, ni;

        label_t lqsave;
 
        label_t lqsave;
 

-       obits[0] = obits[1] = obits[2] = 0;
+       bzero((caddr_t)ibits, sizeof(ibits));
+       bzero((caddr_t)obits, sizeof(obits));

        if (uap->nd > NOFILE)
                uap->nd = NOFILE;       /* forgiving, if slightly wrong */
        if (uap->nd > NOFILE)
                uap->nd = NOFILE;       /* forgiving, if slightly wrong */

-       mask = (1 << uap->nd) - 1;
+       ni = howmany(uap->nd, NFDBITS);

 
 #define        getbits(name, x) \
        if (uap->name) { \
                u.u_error = copyin((caddr_t)uap->name, (caddr_t)&ibits[x], \
 
 #define        getbits(name, x) \
        if (uap->name) { \
                u.u_error = copyin((caddr_t)uap->name, (caddr_t)&ibits[x], \

-                   sizeof (ibits[x])); \
+                   (unsigned)(ni * sizeof(fd_mask))); \

                if (u.u_error) \
                        goto done; \
                if (u.u_error) \
                        goto done; \

-               ibits[x] &= mask; \
-       } else \
-               ibits[x] = 0;
+       }

        getbits(in, 0);
        getbits(ou, 1);
        getbits(ex, 2);
        getbits(in, 0);
        getbits(ou, 1);
        getbits(ex, 2);


@@ -284,15 +460,15 @@ select()
                        u.u_error = EINVAL;
                        goto done;
                }
                        u.u_error = EINVAL;
                        goto done;
                }

-               s = spl7(); timevaladd(&atv, &time); splx(s);
+               s = splhigh(); timevaladd(&atv, &time); splx(s);

        }
 retry:
        ncoll = nselcoll;
        u.u_procp->p_flag |= SSEL;
        }
 retry:
        ncoll = nselcoll;
        u.u_procp->p_flag |= SSEL;

-       u.u_r.r_val1 = selscan(ibits, obits);
+       u.u_r.r_val1 = selscan(ibits, obits, uap->nd);

        if (u.u_error || u.u_r.r_val1)
                goto done;
        if (u.u_error || u.u_r.r_val1)
                goto done;

-       s = spl6();
+       s = splhigh();

        /* this should be timercmp(&time, &atv, >=) */
        if (uap->tv && (time.tv_sec > atv.tv_sec ||
            time.tv_sec == atv.tv_sec && time.tv_usec >= atv.tv_usec)) {
        /* this should be timercmp(&time, &atv, >=) */
        if (uap->tv && (time.tv_sec > atv.tv_sec ||
            time.tv_sec == atv.tv_sec && time.tv_usec >= atv.tv_usec)) {


@@ -300,7 +476,6 @@ retry:
                goto done;
        }
        if ((u.u_procp->p_flag & SSEL) == 0 || nselcoll != ncoll) {
                goto done;
        }
        if ((u.u_procp->p_flag & SSEL) == 0 || nselcoll != ncoll) {

-               u.u_procp->p_flag &= ~SSEL;

                splx(s);
                goto retry;
        }
                splx(s);
                goto retry;
        }


@@ -323,23 +498,26 @@ retry:
        splx(s);
        goto retry;
 done:
        splx(s);
        goto retry;
 done:

+       u.u_procp->p_flag &= ~SSEL;

 #define        putbits(name, x) \
        if (uap->name) { \
                int error = copyout((caddr_t)&obits[x], (caddr_t)uap->name, \
 #define        putbits(name, x) \
        if (uap->name) { \
                int error = copyout((caddr_t)&obits[x], (caddr_t)uap->name, \

-                   sizeof (obits[x])); \
+                   (unsigned)(ni * sizeof(fd_mask))); \

                if (error) \
                        u.u_error = error; \
        }
                if (error) \
                        u.u_error = error; \
        }

-       putbits(in, 0);
-       putbits(ou, 1);
-       putbits(ex, 2);
+       if (u.u_error == 0) {
+               putbits(in, 0);
+               putbits(ou, 1);
+               putbits(ex, 2);

 #undef putbits
 #undef putbits

+       }

 }
 
 unselect(p)
        register struct proc *p;
 {
 }
 
 unselect(p)
        register struct proc *p;
 {

-       register int s = spl6();
+       register int s = splhigh();

 
        switch (p->p_stat) {
 
 
        switch (p->p_stat) {
 


@@ -354,17 +532,16 @@ unselect(p)
        splx(s);
 }
 
        splx(s);
 }
 

-selscan(ibits, obits)
-       int *ibits, *obits;
+selscan(ibits, obits, nfd)
+       fd_set *ibits, *obits;

 {
 {

-       register int which, bits, i;
+       register int which, i, j;
+       register fd_mask bits;

        int flag;
        struct file *fp;
        int n = 0;
 
        for (which = 0; which < 3; which++) {
        int flag;
        struct file *fp;
        int n = 0;
 
        for (which = 0; which < 3; which++) {

-               bits = ibits[which];
-               obits[which] = 0;

                switch (which) {
 
                case 0:
                switch (which) {
 
                case 0:


@@ -376,16 +553,19 @@ selscan(ibits, obits)
                case 2:
                        flag = 0; break;
                }
                case 2:
                        flag = 0; break;
                }

-               while (i = ffs(bits)) {
-                       bits &= ~(1<<(i-1));
-                       fp = u.u_ofile[i-1];
-                       if (fp == NULL) {
-                               u.u_error = EBADF;
-                               break;
-                       }
-                       if ((*fp->f_ops->fo_select)(fp, flag)) {
-                               obits[which] |= (1<<(i-1));
-                               n++;
+               for (i = 0; i < nfd; i += NFDBITS) {
+                       bits = ibits[which].fds_bits[i/NFDBITS];
+                       while ((j = ffs(bits)) && i + --j < nfd) {
+                               bits &= ~(1 << j);
+                               fp = u.u_ofile[i + j];
+                               if (fp == NULL) {
+                                       u.u_error = EBADF;
+                                       break;
+                               }
+                               if ((*fp->f_ops->fo_select)(fp, flag)) {
+                                       FD_SET(i + j, &obits[which]);
+                                       n++;
+                               }

                        }
                }
        }
                        }
                }
        }


@@ -411,10 +591,13 @@ selwakeup(p, coll)
                wakeup((caddr_t)&selwait);
        }
        if (p) {
                wakeup((caddr_t)&selwait);
        }
        if (p) {

-               int s = spl6();
-               if (p->p_wchan == (caddr_t)&selwait)
-                       setrun(p);
-               else if (p->p_flag & SSEL)
+               int s = splhigh();
+               if (p->p_wchan == (caddr_t)&selwait) {
+                       if (p->p_stat == SSLEEP)
+                               setrun(p);
+                       else
+                               unsleep(p);
+               } else if (p->p_flag & SSEL)

                        p->p_flag &= ~SSEL;
                splx(s);
        }
                        p->p_flag &= ~SSEL;
                splx(s);
        }