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 76185cba998de1c62643cf837f0936a55af4a5ed..868f9f9415d861fa9041ff2d9dc1daa3b61e0e47 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]
+
        --- 9.9.7-P1 released ---
 
 4138.  [bug]           An uninitialized value in validator.c could result

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index f46577f01d7b2c24a60720caa7d57e146b7c2de2..0bfc7ef6c5dc8867e2ce4b1e8e57485f8358c973 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -650,6 +650,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) {