avoid requests for more descriptors than the kernel allows

SCCS-vsn: sys/kern/kern_descrip.c 7.40

diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index 4ebab3e..06dc959 100644 (file)
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_descrip.c      7.39 (Berkeley) %G%
+ *     @(#)kern_descrip.c      7.40 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -101,7 +101,8 @@ dup2(p, uap, retval)
 
        if (old >= fdp->fd_nfiles ||
            (fp = fdp->fd_ofiles[old]) == NULL ||
 
        if (old >= fdp->fd_nfiles ||
            (fp = fdp->fd_ofiles[old]) == NULL ||

-           new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur)
+           new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur ||
+           new > maxfiles)

                return (EBADF);
        *retval = new;
        if (old == new)
                return (EBADF);
        *retval = new;
        if (old == new)