2126. [bug] Serialise validation of type ANY responses. [RT #16555]

diff --git a/CHANGES b/CHANGES
index f4b36d9204e965d986972f3dc31e9cf425e52764..56fd95a5e01c953c29bc11c1139a3196e787d78f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+2126.  [bug]           Serialise validation of type ANY responses. [RT #16555]
 
        --- 9.3.3 released ---
 

diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 00e9ee32b75a704828091389a3d091970500480b..a0d6acb68c0d98af29ec9a2595bb2c02450c101a 100644 (file)
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.18.12.11 2006/01/06 00:01:42 marka Exp $ */
+/* $Id: validator.h,v 1.18.12.11.6.1 2007/01/11 04:51:39 marka Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1
@@ -144,6 +144,7 @@ struct dns_validator {
  * dns_validator_create() options.
  */
 #define DNS_VALIDATOR_DLV 1U
+#define DNS_VALIDATOR_DEFER 2U
 
 ISC_LANG_BEGINDECLS
 
@@ -191,6 +192,15 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
  * the answer by looking for a appopriate DLV RRset.
  */
 
+void
+dns_validator_send(dns_validator_t *validator);
+/*%<
+ * Send a deferred validation request
+ *
+ * Requires:
+ *     'validator' to points to a valid DNSSEC validator.
+ */
+
 void
 dns_validator_cancel(dns_validator_t *validator);
 /*%<

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index b9e69c8c873099febb463ac741ab0709d4d6b99b..d583f5349ccea558166f7f8fa9d6144f579b18e9 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.218.2.18.4.64 2006/08/31 03:57:11 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.64.4.1 2007/01/11 04:51:39 marka Exp $ */
 
 #include <config.h>
 
@@ -369,6 +369,9 @@ valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name,
        valarg->fctx = fctx;
        valarg->addrinfo = addrinfo;
 
+       if (!ISC_LIST_EMPTY(fctx->validators))
+               INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0);
+
        result = dns_validator_create(fctx->res->view, name, type, rdataset,
                                      sigrdataset, fctx->rmessage,
                                      valoptions, task, validated, valarg,
@@ -973,6 +976,8 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
        if (result != ISC_R_SUCCESS)
                return (result);
 
+       INSIST(ISC_LIST_EMPTY(fctx->validators));
+
        dns_message_reset(fctx->rmessage, DNS_MESSAGE_INTENTPARSE);
 
        query = isc_mem_get(res->mctx, sizeof(*query));
@@ -3093,12 +3098,21 @@ maybe_destroy(fetchctx_t *fctx) {
        unsigned int bucketnum;
        isc_boolean_t bucket_empty = ISC_FALSE;
        dns_resolver_t *res = fctx->res;
+       dns_validator_t *validator;
 
        REQUIRE(SHUTTINGDOWN(fctx));
 
-       if (fctx->pending != 0 || !ISC_LIST_EMPTY(fctx->validators))
+       if (fctx->pending != 0)
                return;
 
+       for (validator = ISC_LIST_HEAD(fctx->validators);
+            validator != NULL;
+            validator = ISC_LIST_HEAD(fctx->validators)) {
+               ISC_LIST_UNLINK(fctx->validators, validator, link);
+               dns_validator_cancel(validator);
+               dns_validator_destroy(&validator);
+       }
+
        bucketnum = fctx->bucketnum;
        LOCK(&res->buckets[bucketnum].lock);
        if (fctx->references == 0)
@@ -3232,7 +3246,9 @@ validated(isc_task_t *task, isc_event_t *event) {
                add_bad(fctx, &addrinfo->sockaddr, result);
                isc_event_free(&event);
                UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
-               if (sentresponse)
+               if (!ISC_LIST_EMPTY(fctx->validators))
+                       dns_validator_send(ISC_LIST_HEAD(fctx->validators));
+               else if (sentresponse)
                        fctx_done(fctx, result);        /* Locks bucket. */
                else
                        fctx_try(fctx);                 /* Locks bucket. */
@@ -3330,6 +3346,7 @@ validated(isc_task_t *task, isc_event_t *event) {
                 * be validated.
                 */
                UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+               dns_validator_send(ISC_LIST_HEAD(fctx->validators));
                goto cleanup_event;
        }
 
@@ -3640,6 +3657,13 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
                                                           rdataset,
                                                           sigrdataset,
                                                           valoptions, task);
+                                       /*
+                                        * Defer any further validations.
+                                        * This prevents multiple validators
+                                        * from manipulating fctx->rmessage
+                                        * simultaniously.
+                                        */
+                                       valoptions |= DNS_VALIDATOR_DEFER;
                                }
                        } else if (CHAINING(rdataset)) {
                                if (rdataset->type == dns_rdatatype_cname)

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index ec727b71255a0018185bf263875f7a89c551327c..571ad791e7b6c71b0dfd62a49cc6ae798f90f36f 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.5.8.27.6.1 2007/01/11 04:51:39 marka Exp $ */
 
 #include <config.h>
 
@@ -2825,7 +2825,8 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
        ISC_LINK_INIT(val, link);
        val->magic = VALIDATOR_MAGIC;
 
-       isc_task_send(task, ISC_EVENT_PTR(&event));
+       if ((options & DNS_VALIDATOR_DEFER) == 0)
+               isc_task_send(task, ISC_EVENT_PTR(&event));
 
        *validatorp = val;
 
@@ -2842,6 +2843,21 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
        return (result);
 }
 
+void
+dns_validator_send(dns_validator_t *validator) {
+       isc_event_t *event;
+       REQUIRE(VALID_VALIDATOR(validator));
+
+       LOCK(&validator->lock);
+
+       INSIST((validator->options & DNS_VALIDATOR_DEFER) != 0);
+       event = (isc_event_t *)validator->event;
+       validator->options &= ~DNS_VALIDATOR_DEFER;
+       UNLOCK(&validator->lock);
+
+       isc_task_send(validator->task, ISC_EVENT_PTR(&event));
+}
+
 void
 dns_validator_cancel(dns_validator_t *validator) {
        REQUIRE(VALID_VALIDATOR(validator));
@@ -2856,6 +2872,12 @@ dns_validator_cancel(dns_validator_t *validator) {
 
                if (validator->subvalidator != NULL)
                        dns_validator_cancel(validator->subvalidator);
+               if ((validator->options & DNS_VALIDATOR_DEFER) != 0) {
+                       isc_task_t *task = validator->event->ev_sender;
+                       validator->options &= ~DNS_VALIDATOR_DEFER;
+                       isc_event_free((isc_event_t **)&validator->event);
+                       isc_task_detach(&task);
+               }
        }
        UNLOCK(&validator->lock);
 }