2640. [security] A specially crafted update packet will cause named

                        to exit. [RT #20000]

diff --git a/CHANGES b/CHANGES
index 982a6f744b0476cbd9fb1cbecb072a140af25ec4..7d223af429dfc6a072bbf81d23a714dbcc0b82ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+       --- 9.5.1-P3 released ---
+
+2640.  [security]      A specially crafted update packet will cause named
+                       to exit. [RT #20000]
+
        --- 9.5.1-P2 released ---
 
 2579.  [bug]           DNSSEC lookaside validation failed to handle unknown

diff --git a/bin/named/update.c b/bin/named/update.c
index 32248d786c310dc5bc8c9537078249ec38070ed5..ae7dbeef44044a6d8cc52ef98f6b988d234c3ba1 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.138.2.7 2008/11/19 06:20:58 marka Exp $ */
+/* $Id: update.c,v 1.138.2.7.2.1 2009/07/28 14:07:14 marka Exp $ */
 
 #include <config.h>
 
@@ -950,7 +950,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db,
                        if (type == dns_rdatatype_rrsig ||
                            type == dns_rdatatype_sig)
                                covers = dns_rdata_covers(&t->rdata);
-                       else
+                       else if (type == dns_rdatatype_any) {
+                               dns_db_detachnode(db, &node);
+                               dns_diff_clear(&trash);
+                               return (DNS_R_NXRRSET);
+                       } else
                                covers = 0;
 
                        /*

diff --git a/version b/version
index 09a82776f7721847ef425e7aea5a6293b90f0d4b..586ea781b51f59e016d553acc066eb79c231e79d 100644 (file)
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.39.18.9.2.4 2009/03/17 02:11:19 marka Exp $
+# $Id: version,v 1.39.18.9.2.5 2009/07/28 14:07:14 marka Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=5
 PATCHVER=1
 RELEASETYPE=-P
-RELEASEVER=2
+RELEASEVER=3