fix enforcement of tcp-clients (v1)

tcp-clients settings could be exceeded in some cases by
creating more and more active TCP clients that are over
the set quota limit, which in the end could lead to a
DoS attack by e.g. exhaustion of file descriptors.

If TCP client we're closing went over the quota (so it's
not attached to a quota) mark it as mortal - so that it
will be destroyed and not set up to listen for new
connections - unless it's the last client for a specific
interface.

(cherry picked from commit f97131d21b97381cef72b971b157345c1f9b4115)
(cherry picked from commit 9689ffc485df8f971f0ad81ab8ab1f5389493776)

diff --git a/bin/named/client.c b/bin/named/client.c
index d482da7121450c13903f68ea757bfffc40296aa2..0739dd48af2620d45c3eb3bc0baff4f7d394d912 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -421,8 +421,19 @@ exit_check(ns_client_t *client) {
                        isc_socket_detach(&client->tcpsocket);
                }
 
-               if (client->tcpquota != NULL)
+               if (client->tcpquota != NULL) {
                        isc_quota_detach(&client->tcpquota);
+               } else {
+                       /*
+                        * We went over quota with this client, we don't
+                        * want to restart listening unless this is the
+                        * last client on this interface, which is
+                        * checked later.
+                        */
+                       if (TCP_CLIENT(client)) {
+                               client->mortal = true;
+                       }
+               }
 
                if (client->timerset) {
                        (void)isc_timer_reset(client->timer,