Module Name: src
Committed By: riz
Date: Thu Dec 13 17:42:04 UTC 2012
Modified Files:
src/external/bsd/bind/dist [netbsd-6-0]: CHANGES version
src/external/bsd/bind/dist/bin/named [netbsd-6-0]: query.c
Log Message:
external/bsd/bind/dist/CHANGES patch
external/bsd/bind/dist/version patch
external/bsd/bind/dist/bin/named/query.c patch
Address CVE-2012-5688: Named could die on specific queries with dns64
enabled.
[spz, ticket #740]
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.4 -r1.2.2.4.2.1 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.1.1.10.4.4 -r1.1.1.10.4.4.2.1 \
src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7.2.2 -r1.7.2.2.2.1 \
src/external/bsd/bind/dist/bin/named/query.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.2.2.4 src/external/bsd/bind/dist/CHANGES:1.2.2.4.2.1
--- src/external/bsd/bind/dist/CHANGES:1.2.2.4 Tue Oct 9 23:58:08 2012
+++ src/external/bsd/bind/dist/CHANGES Thu Dec 13 17:42:04 2012
@@ -1,3 +1,8 @@
+ --- diff from 9.9.2 to 9.9.2-P1 --
+
+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.1-P4 released ---
3383. [security] A certain combination of records in the RBT could
Index: src/external/bsd/bind/dist/version
diff -u src/external/bsd/bind/dist/version:1.1.1.10.4.4 src/external/bsd/bind/dist/version:1.1.1.10.4.4.2.1
--- src/external/bsd/bind/dist/version:1.1.1.10.4.4 Tue Oct 9 23:58:08 2012
+++ src/external/bsd/bind/dist/version Thu Dec 13 17:42:04 2012
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=9
PATCHVER=1
RELEASETYPE=-P
-RELEASEVER=4
+RELEASEVER=4nb1
Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2 src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2.2.1
--- src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2 Tue Oct 9 23:58:09 2012
+++ src/external/bsd/bind/dist/bin/named/query.c Thu Dec 13 17:42:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.7.2.2 2012/10/09 23:58:09 riz Exp $ */
+/* $NetBSD: query.c,v 1.7.2.2.2.1 2012/12/13 17:42:04 riz Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
@@ -5178,10 +5178,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t
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)
