From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 3 Nov 2015 10:08:57 +0000 (+0100)
Subject: IO: Handle fd values too big for select()
X-Git-Tag: v1.6.0~27^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=338f85ca7721fac16394ccabd561ddb5ccaacb36;p=thirdparty%2Fbird.git

IO: Handle fd values too big for select()

If the number of sockets is too much for select(), we should at least
handle it with proper error messages and reject new sockets instead of
breaking the event loop.

Thanks to Alexander V. Chernikov for the patch.
---

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 0724667d1..726f1e49e 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1309,6 +1309,16 @@ sk_passive_connected(sock *s, int type)
     return 0;
   }
 
+  if (fd >= FD_SETSIZE)
+  {
+    /* FIXME: Call err_hook instead ? */
+    log(L_ERR "SOCK: Incoming connection from %I%J (port %d) %s",
+	t->daddr, ipa_is_link_local(t->daddr) ? t->iface : NULL,
+	t->dport, "rejected due to FD_SETSIZE limit");
+    close(fd);
+    return 1;
+  }
+
   sock *t = sk_new(s->pool);
   t->type = type;
   t->fd = fd;
@@ -1404,6 +1414,9 @@ sk_open(sock *s)
   if (fd < 0)
     ERR("socket");
 
+  if (fd >= FD_SETSIZE)
+    ERR2("FD_SETSIZE limit reached");
+
   s->af = af;
   s->fd = fd;