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 491ca7a90ab1afe913ce2522d07239f36cb4989d..eb30ea3794abac791d0056323a886390bb9837f0 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.10.2-P2 released ---
 
 4138.  [bug]           An uninitialized value in validator.c could result

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index f65e0b022fd9752535e9a259964fa88ed4d8f774..4f581879decab7838b542833ed6050a3f7ef1582 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -655,6 +655,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) {