3693. [security] memcpy was incorrectly called with overlapping

                        ranges resulting in malformed names being generated
                        on some platforms.  This could cause INSIST failures
                        when serving NSEC3 signed zones.  [RT #35120]

(cherry picked from commit fa467e60c590072fd6848522456eb2cc41582c59)

diff --git a/CHANGES b/CHANGES
index 3ed3a9038ae38945edaa2991c1a64d08b6092150..69c68034580956e41538b2a810d07180d6f55a45 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,9 @@
        --- 9.9.4-P2 released ---
 
 3693.  [security]      memcpy was incorrectly called with overlapping
-                       ranges resulting a malformed names being generated
-                       on some platforms.  This was subsequently detected
-                       resulting in INSIST failures when serving NSEC3
-                       signed zones.  [RT #35120]
+                       ranges resulting in malformed names being generated
+                       on some platforms.  This could cause INSIST failures
+                       when serving NSEC3 signed zones.  [RT #35120]
 
        --- 9.9.4-P1 released ---
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 3e3b877859a2349169b81f87d1c983f51b4bd39f..f9bfcbe7d6d5a29eeb6c5d696795df530101106c 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -5260,8 +5260,7 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db,
        dns_fixedname_t fixed;
        dns_hash_t hash;
        dns_name_t name;
-       int order;
-       unsigned int count;
+       unsigned int skip = 0, labels;
        dns_rdata_nsec3_t nsec3;
        dns_rdata_t rdata = DNS_RDATA_INIT;
        isc_boolean_t optout;
@@ -5276,6 +5275,7 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db,
 
        dns_name_init(&name, NULL);
        dns_name_clone(qname, &name);
+       labels = dns_name_countlabels(&name);
        dns_clientinfomethods_init(&cm, ns_client_sourceip);
        dns_clientinfo_init(&ci, client);
 
@@ -5309,13 +5309,14 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db,
                dns_rdata_reset(&rdata);
                optout = ISC_TF((nsec3.flags & DNS_NSEC3FLAG_OPTOUT) != 0);
                if (found != NULL && optout &&
-                   dns_name_fullcompare(&name, dns_db_origin(db), &order,
-                                        &count) == dns_namereln_subdomain) {
+                   dns_name_issubdomain(&name, dns_db_origin(db)))
+               {
                        dns_rdataset_disassociate(rdataset);
                        if (dns_rdataset_isassociated(sigrdataset))
                                dns_rdataset_disassociate(sigrdataset);
-                       count = dns_name_countlabels(&name) - 1;
-                       dns_name_getlabelsequence(&name, 1, count, &name);
+                       skip++;
+                       dns_name_getlabelsequence(qname, skip, labels - skip,
+                                                 &name);
                        ns_client_log(client, DNS_LOGCATEGORY_DNSSEC,
                                      NS_LOGMODULE_QUERY, ISC_LOG_DEBUG(3),
                                      "looking for closest provable encloser");
@@ -5333,7 +5334,11 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db,
                ns_client_log(client, DNS_LOGCATEGORY_DNSSEC,
                              NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
                              "expected covering NSEC3, got an exact match");
-       if (found != NULL)
+       if (found == qname) {
+               if (skip != 0U)
+                       dns_name_getlabelsequence(qname, skip, labels - skip,
+                                                 found);
+       } else if (found != NULL)
                dns_name_copy(&name, found, NULL);
        return;
 }