[src/netbsd-6-0]: src/external/bsd/bind/dist external/bsd/bind/dist/CHANGES ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f8804ca6791a
branches:  netbsd-6-0
changeset: 774713:f8804ca6791a
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Dec 13 17:42:04 2012 +0000

description:
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]

diffstat:

 external/bsd/bind/dist/CHANGES           |  5 +++++
 external/bsd/bind/dist/bin/named/query.c |  6 ++++--
 external/bsd/bind/dist/version           |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r fdc9f1223b33 -r f8804ca6791a external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES    Tue Dec 11 04:27:04 2012 +0000
+++ b/external/bsd/bind/dist/CHANGES    Thu Dec 13 17:42:04 2012 +0000
@@ -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
diff -r fdc9f1223b33 -r f8804ca6791a external/bsd/bind/dist/bin/named/query.c
--- a/external/bsd/bind/dist/bin/named/query.c  Tue Dec 11 04:27:04 2012 +0000
+++ b/external/bsd/bind/dist/bin/named/query.c  Thu Dec 13 17:42:04 2012 +0000
@@ -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 @@
        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 -r fdc9f1223b33 -r f8804ca6791a external/bsd/bind/dist/version
--- a/external/bsd/bind/dist/version    Tue Dec 11 04:27:04 2012 +0000
+++ b/external/bsd/bind/dist/version    Thu Dec 13 17:42:04 2012 +0000
@@ -7,4 +7,4 @@
 MINORVER=9
 PATCHVER=1
 RELEASETYPE=-P
-RELEASEVER=4
+RELEASEVER=4nb1