3178. [bug] A race condition introduced by change #3163 could

			cause an assertion failure on shutdown. [RT #26271]

diff --git a/CHANGES b/CHANGES
index f844d749d2c884201d941ab0d6dfd7ab6a225db0..0565400ce479582e092213709aedf9e4c983d393 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3178.  [bug]           A race condition introduced by change #3163 could
+                       cause an assertion failure on shutdown. [RT #26271]
+
 3177.  [func]          'rndc keydone', remove the indicator record that
                        named has finished signing the zone with the
                        corresponding key.  [RT #26206]

diff --git a/bin/named/client.c b/bin/named/client.c
index e8c1da679e28d53cdd679e4c819b86c9fffa554b..864e8ac4bc21b0ed8a1b58549465768983fbf9b8 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.280 2011/10/11 23:46:44 tbox Exp $ */
+/* $Id: client.c,v 1.281 2011/10/25 16:21:21 each Exp $ */
 
 #include <config.h>
 
@@ -1956,6 +1956,11 @@ static isc_result_t
 get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) {
        isc_mem_t *clientmctx;
        isc_result_t result;
+#if NMCTXS > 0
+       unsigned int nextmctx;
+#endif
+
+       MTRACE("clientmctx");
 
        /*
         * Caller must be holding the manager lock.
@@ -1967,19 +1972,21 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) {
                return (result);
        }
 #if NMCTXS > 0
-       INSIST(manager->nextmctx < NMCTXS);
-       clientmctx = manager->mctxpool[manager->nextmctx];
+       nextmctx = manager->nextmctx++;
+       if (manager->nextmctx == NMCTXS)
+               manager->nextmctx = 0;
+
+       INSIST(nextmctx < NMCTXS);
+
+       clientmctx = manager->mctxpool[nextmctx];
        if (clientmctx == NULL) {
                result = isc_mem_create(0, 0, &clientmctx);
                if (result != ISC_R_SUCCESS)
                        return (result);
                isc_mem_setname(clientmctx, "client", NULL);
 
-               manager->mctxpool[manager->nextmctx] = clientmctx;
+               manager->mctxpool[nextmctx] = clientmctx;
        }
-       manager->nextmctx++;
-       if (manager->nextmctx == NMCTXS)
-               manager->nextmctx = 0;
 #else
        clientmctx = manager->mctx;
 #endif
@@ -2545,7 +2552,9 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp,
        else {
                MTRACE("create new");
 
+               LOCK(&manager->lock);
                result = client_create(manager, &client);
+               UNLOCK(&manager->lock);
                if (result != ISC_R_SUCCESS)
                        return (result);
 
@@ -2591,18 +2600,11 @@ ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n,
 
        MTRACE("createclients");
 
-       /*
-        * We MUST lock the manager lock for the entire client creation
-        * process.  If we didn't do this, then a client could get a
-        * shutdown event and disappear out from under us.
-        */
-       LOCK(&manager->lock);
        for (disp = 0; disp < n; disp++) {
                result = get_client(manager, ifp, ifp->udpdispatch[disp], tcp);
                if (result != ISC_R_SUCCESS)
                        break;
        }
-       UNLOCK(&manager->lock);
 
        return (result);
 }