1968. [bug] Missing lock in resolver.c:validated(). [RT #15739]

diff --git a/CHANGES b/CHANGES
index 90e6cb3679aacc334144bc6b42a2eb447b008d94..d22e148f005dc0d01764549f47bdb3653f272245 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1968.  [bug]           Missing lock in resolver.c:validated(). [RT #15739]
+
 1967.  [func]          dig/nslookup/host: warn about missing "QR". [RT #15779]
 
 1966.  [bug]           Don't set CD when we have fallen back to plain DNS.

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index a168c3fc1ef3f3346981d01708733668b9143017..3c082be07b72e8dc696aad99baadd3836646f998 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.327 2006/01/06 00:38:21 marka Exp $ */
+/* $Id: resolver.c,v 1.328 2006/01/06 01:05:46 marka Exp $ */
 
 /*! \file */
 
@@ -3215,10 +3215,12 @@ validated(isc_task_t *task, isc_event_t *event) {
         * so, destroy the fctx.
         */
        if (SHUTTINGDOWN(fctx) && !sentresponse) {
-               maybe_destroy(fctx);
+               maybe_destroy(fctx);    /* Locks bucket. */
                goto cleanup_event;
        }
 
+       LOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
        /*
         * If chaining, we need to make sure that the right result code is
         * returned, and that the rdatasets are bound.
@@ -3277,10 +3279,11 @@ validated(isc_task_t *task, isc_event_t *event) {
                result = vevent->result;
                add_bad(fctx, &addrinfo->sockaddr, result);
                isc_event_free(&event);
+               UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
                if (sentresponse)
-                       fctx_done(fctx, result);
+                       fctx_done(fctx, result);        /* Locks bucket. */
                else
-                       fctx_try(fctx);
+                       fctx_try(fctx);                 /* Locks bucket. */
                return;
        }
 
@@ -3359,9 +3362,9 @@ validated(isc_task_t *task, isc_event_t *event) {
                 * If we only deferred the destroy because we wanted to cache
                 * the data, destroy now.
                 */
+               UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
                if (SHUTTINGDOWN(fctx))
-                       maybe_destroy(fctx);
-
+                       maybe_destroy(fctx);    /* Locks bucket. */
                goto cleanup_event;
        }
 
@@ -3374,6 +3377,7 @@ validated(isc_task_t *task, isc_event_t *event) {
                 * more rdatasets that still need to
                 * be validated.
                 */
+               UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
                goto cleanup_event;
        }
 
@@ -3446,7 +3450,9 @@ validated(isc_task_t *task, isc_event_t *event) {
        if (node != NULL)
                dns_db_detachnode(fctx->cache, &node);
 
-       fctx_done(fctx, result);
+       UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
+       fctx_done(fctx, result);        /* Locks bucket. */
 
  cleanup_event:
        isc_event_free(&event);