summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--bin/named/query.c4
-rw-r--r--srcid1
-rw-r--r--version4
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 11e48c03..9c373594 100644
--- 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 cc706225..1b2a8152 100644
--- 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/srcid b/srcid
new file mode 100644
index 00000000..54025876
--- /dev/null
+++ b/srcid
@@ -0,0 +1 @@
+SRCID=489c6c10
diff --git a/version b/version
index ad8f80fa..676f567f 100644
--- a/version
+++ b/version
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=9
PATCHVER=2
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1