3407. [security] Named could die on specific queries with dns64 enabled.

                        [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]

diff --git a/CHANGES b/CHANGES
index 11e48c0331b495de2b286a8086fa49d51aa9284e..9c37359465130b8167d63625c1549093f4d4a790 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+       --- 9.9.2-P1 released ---
+
+3407.  [security]      Named could die on specific queries with dns64 enabled.
+                       [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+
        --- 9.9.2 released ---
 
 3383.  [security]      A certain combination of records in the RBT could

diff --git a/bin/named/query.c b/bin/named/query.c
index cc706225a51ee0258daf2e95e49a601a6a619d7d..1b2a81525af5c7467f1bfd70fc757bf14f57b55d 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -5242,10 +5242,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t *version) {
        isc_result_t result;
        isc_uint32_t ttl = ISC_UINT32_MAX;
 
+       dns_rdataset_init(&rdataset);
+
        result = dns_db_getoriginnode(db, &node);
        if (result != ISC_R_SUCCESS)
                goto cleanup;
-       dns_rdataset_init(&rdataset);
+
        result = dns_db_findrdataset(db, node, version, dns_rdatatype_soa,
                                     0, 0, &rdataset, NULL);
        if (result != ISC_R_SUCCESS)

diff --git a/version b/version
index ad8f80fa0df830ecdf96601ba9f3394e0edc5fc8..676f567f498e4ea7a4282acfc4e5a5141aff3cf8 100644 (file)
--- a/version
+++ b/version
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=9
 PATCHVER=2
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1