Create fd_sets big enough to handle getdtablesize() descriptors.

4 files changed, 72 insertions, 42 deletions

diff --git a/usr.sbin/ppp/ppp/defs.c b/usr.sbin/ppp/ppp/defs.c
index e9ef8f1d656..2b133bed934 100644
--- a/usr.sbin/ppp/ppp/defs.c
+++ b/usr.sbin/ppp/ppp/defs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: defs.c,v 1.17 2000/09/07 00:05:26 brian Exp $
+ *	$OpenBSD: defs.c,v 1.18 2000/10/09 21:18:56 brian Exp $
  */
 
 
@@ -376,3 +376,15 @@ SetTitle(const char *title)
   else
     setproctitle("%s", title);
 }
+
+fd_set *
+mkfdset()
+{
+  return (fd_set *)malloc(howmany(getdtablesize(), NFDBITS) * sizeof (fd_mask));
+}
+
+void
+zerofdset(fd_set *s)
+{
+  memset(s, '\0', howmany(getdtablesize(), NFDBITS) * sizeof (fd_mask));
+}
diff --git a/usr.sbin/ppp/ppp/defs.h b/usr.sbin/ppp/ppp/defs.h
index 15ae31784da..e88a413b5e0 100644
--- a/usr.sbin/ppp/ppp/defs.h
+++ b/usr.sbin/ppp/ppp/defs.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $OpenBSD: defs.h,v 1.17 2000/08/31 00:46:12 brian Exp $
+ * $OpenBSD: defs.h,v 1.18 2000/10/09 21:18:56 brian Exp $
  *
  *	TODO:
  */
@@ -121,3 +121,5 @@ extern const char *NumStr(long, char *, size_t);
 extern const char *HexStr(long, char *, size_t);
 extern const char *ex_desc(int);
 extern void SetTitle(const char *);
+extern fd_set *mkfdset(void);
+extern void zerofdset(fd_set *);
diff --git a/usr.sbin/ppp/ppp/ether.c b/usr.sbin/ppp/ppp/ether.c
index 98f210367a5..7b7ee433111 100644
--- a/usr.sbin/ppp/ppp/ether.c
+++ b/usr.sbin/ppp/ppp/ether.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: ether.c,v 1.4 2000/06/28 09:35:19 brian Exp $
+ *	$OpenBSD: ether.c,v 1.5 2000/10/09 21:18:56 brian Exp $
  */
 
 #include <sys/param.h>
@@ -203,15 +203,23 @@ ether_MessageIn(struct etherdevice *dev)
   char unknown[14];
   const char *msg;
   struct timeval t;
-  fd_set r;
+  fd_set *r;
+  int ret;
 
   if (dev->cs < 0)
     return;
 
-  FD_ZERO(&r);
-  FD_SET(dev->cs, &r);
+  if ((r = mkfdset()) == NULL) {
+    log_Printf(LogERROR, "DoLoop: Cannot create fd_set\n");
+    return;
+  }
+  zerofdset(r);
+  FD_SET(dev->cs, r);
   t.tv_sec = t.tv_usec = 0;
-  if (select(dev->cs + 1, &r, NULL, NULL, &t) <= 0)
+  ret = select(dev->cs + 1, r, NULL, NULL, &t);
+  free(r);
+
+  if (ret <= 0)
     return;
 
   if (NgRecvMsg(dev->cs, rep, sizeof msgbuf, NULL) < 0)
diff --git a/usr.sbin/ppp/ppp/main.c b/usr.sbin/ppp/ppp/main.c
index fa0eccb9b10..b68a10dd364 100644
--- a/usr.sbin/ppp/ppp/main.c
+++ b/usr.sbin/ppp/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $OpenBSD: main.c,v 1.21 2000/04/09 18:27:25 brian Exp $
+ * $OpenBSD: main.c,v 1.22 2000/10/09 21:18:57 brian Exp $
  *
  *	TODO:
  */
@@ -281,21 +281,11 @@ main(int argc, char **argv)
 {
   char *name;
   const char *lastlabel;
-  int nfds, label, arg;
+  int label, arg;
   struct bundle *bundle;
   struct prompt *prompt;
   struct switches sw;
 
-  nfds = getdtablesize();
-  if (nfds >= FD_SETSIZE)
-    /*
-     * If we've got loads of file descriptors, make sure they're all
-     * closed.  If they aren't, we may end up with a seg fault when our
-     * `fd_set's get too big when select()ing !
-     */
-    while (--nfds > 2)
-      close(nfds);
-
   name = strrchr(argv[0], '/');
   log_Open(name ? name + 1 : argv[0]);
 
@@ -501,23 +491,41 @@ main(int argc, char **argv)
 static void
 DoLoop(struct bundle *bundle)
 {
-  fd_set rfds, wfds, efds;
+  fd_set *rfds, *wfds, *efds;
   int i, nfds, nothing_done;
   struct probe probe;
 
   probe_Init(&probe);
 
+  if ((rfds = mkfdset()) == NULL) {
+    log_Printf(LogERROR, "DoLoop: Cannot create fd_set\n");
+    return;
+  }
+
+  if ((wfds = mkfdset()) == NULL) {
+    log_Printf(LogERROR, "DoLoop: Cannot create fd_set\n");
+    free(rfds);
+    return;
+  }
+
+  if ((efds = mkfdset()) == NULL) {
+    log_Printf(LogERROR, "DoLoop: Cannot create fd_set\n");
+    free(rfds);
+    free(wfds);
+    return;
+  }
+
   for (; !bundle_IsDead(bundle); bundle_CleanDatalinks(bundle)) {
     nfds = 0;
-    FD_ZERO(&rfds);
-    FD_ZERO(&wfds);
-    FD_ZERO(&efds);
+    zerofdset(rfds);
+    zerofdset(wfds);
+    zerofdset(efds);
 
     /* All our datalinks, the tun device and the MP socket */
-    descriptor_UpdateSet(&bundle->desc, &rfds, &wfds, &efds, &nfds);
+    descriptor_UpdateSet(&bundle->desc, rfds, wfds, efds, &nfds);
 
     /* All our prompts and the diagnostic socket */
-    descriptor_UpdateSet(&server.desc, &rfds, NULL, NULL, &nfds);
+    descriptor_UpdateSet(&server.desc, rfds, NULL, NULL, &nfds);
 
     bundle_CleanDatalinks(bundle);
     if (bundle_IsDead(bundle))
@@ -535,7 +543,7 @@ DoLoop(struct bundle *bundle)
     if (sig_Handle())
       continue;
 
-    i = select(nfds, &rfds, &wfds, &efds, NULL);
+    i = select(nfds, rfds, wfds, efds, NULL);
 
     if (i < 0 && errno != EINTR) {
       log_Printf(LogERROR, "DoLoop: select(): %s\n", strerror(errno));
@@ -543,29 +551,29 @@ DoLoop(struct bundle *bundle)
         struct timeval t;
 
         for (i = 0; i <= nfds; i++) {
-          if (FD_ISSET(i, &rfds)) {
+          if (FD_ISSET(i, rfds)) {
             log_Printf(LogTIMER, "Read set contains %d\n", i);
-            FD_CLR(i, &rfds);
+            FD_CLR(i, rfds);
             t.tv_sec = t.tv_usec = 0;
-            if (select(nfds, &rfds, &wfds, &efds, &t) != -1) {
+            if (select(nfds, rfds, wfds, efds, &t) != -1) {
               log_Printf(LogTIMER, "The culprit !\n");
               break;
             }
           }
-          if (FD_ISSET(i, &wfds)) {
+          if (FD_ISSET(i, wfds)) {
             log_Printf(LogTIMER, "Write set contains %d\n", i);
-            FD_CLR(i, &wfds);
+            FD_CLR(i, wfds);
             t.tv_sec = t.tv_usec = 0;
-            if (select(nfds, &rfds, &wfds, &efds, &t) != -1) {
+            if (select(nfds, rfds, wfds, efds, &t) != -1) {
               log_Printf(LogTIMER, "The culprit !\n");
               break;
             }
           }
-          if (FD_ISSET(i, &efds)) {
+          if (FD_ISSET(i, efds)) {
             log_Printf(LogTIMER, "Error set contains %d\n", i);
-            FD_CLR(i, &efds);
+            FD_CLR(i, efds);
             t.tv_sec = t.tv_usec = 0;
-            if (select(nfds, &rfds, &wfds, &efds, &t) != -1) {
+            if (select(nfds, rfds, wfds, efds, &t) != -1) {
               log_Printf(LogTIMER, "The culprit !\n");
               break;
             }
@@ -583,7 +591,7 @@ DoLoop(struct bundle *bundle)
       continue;
 
     for (i = 0; i <= nfds; i++)
-      if (FD_ISSET(i, &efds)) {
+      if (FD_ISSET(i, efds)) {
         log_Printf(LogPHASE, "Exception detected on descriptor %d\n", i);
         /* We deal gracefully with link descriptor exceptions */
         if (!bundle_Exception(bundle, i)) {
@@ -597,18 +605,18 @@ DoLoop(struct bundle *bundle)
 
     nothing_done = 1;
 
-    if (descriptor_IsSet(&server.desc, &rfds)) {
-      descriptor_Read(&server.desc, bundle, &rfds);
+    if (descriptor_IsSet(&server.desc, rfds)) {
+      descriptor_Read(&server.desc, bundle, rfds);
       nothing_done = 0;
     }
 
-    if (descriptor_IsSet(&bundle->desc, &rfds)) {
-      descriptor_Read(&bundle->desc, bundle, &rfds);
+    if (descriptor_IsSet(&bundle->desc, rfds)) {
+      descriptor_Read(&bundle->desc, bundle, rfds);
       nothing_done = 0;
     }
 
-    if (descriptor_IsSet(&bundle->desc, &wfds))
-      if (!descriptor_Write(&bundle->desc, bundle, &wfds) && nothing_done) {
+    if (descriptor_IsSet(&bundle->desc, wfds))
+      if (!descriptor_Write(&bundle->desc, bundle, wfds) && nothing_done) {
         /*
          * This is disasterous.  The OS has told us that something is
          * writable, and all our write()s have failed.  Rather than