4165. [bug] An failure to reset a value to NULL in tkey.c could

                        result in an assertion failure. (CVE-2015-5477)
                        [RT #40046]

(cherry picked from commit dbb064aa7972ef918d9a235b713108a4846cbb62)

diff --git a/CHANGES b/CHANGES
index 8f2aa3e19c3ef2275e5c54a9b79761cc784a418b..fd9140107a03efdc2e50631927e5a97243c0c601 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4165.  [bug]           An failure to reset a value to NULL in tkey.c could
+                       result in an assertion failure. (CVE-2015-5477)
+                       [RT #40046]
+
 4164.  [bug]           Don't rename slave files and journals on out of memory.
                        [RT #40033]
 

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index c442914685aca4fd5c9ee70c1314f93de4eba711..b8eb83a9be92cd90f8a752bbd7b0fd183936365d 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -649,6 +649,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx,
                 * Try the answer section, since that's where Win2000
                 * puts it.
                 */
+               name = NULL;
                if (dns_message_findname(msg, DNS_SECTION_ANSWER, qname,
                                         dns_rdatatype_tkey, 0, &name,
                                         &tkeyset) != ISC_R_SUCCESS) {