From 38c29c1b5b42a78cdf11ecc67393c4d21b6d91d7 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 12 Mar 2019 15:21:10 -0700
Subject: [PATCH] CHANGES, release note

(cherry picked from commit ab5473007e91f011d003ff0ba5ab32fa0d56360c)
(cherry picked from commit 404be59527c95b4631f2c6cdf072d5c7e0e3240d)
---
 CHANGES           | 5 ++++-
 doc/arm/notes.xml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0b8494f518..ae65fd45c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -55,7 +55,10 @@
 
 5200.	[placeholder]
 
-5199.	[placeholder]
+5199.	[security]	In certain configurations, named could crash
+			if nxdomain-redirect was in use and a redirected
+			query resulted in an NXDOMAIN from the cache.
+			(CVE-2019-6467) [GL #880]
 
 5198.	[bug]		If a fetch context was being shut down and, at the same
 			time, we returned from qname minimization, an INSIST
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 4ddca00572..ff01aaa38f 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -87,7 +87,10 @@
     <itemizedlist>
       <listitem>
         <para>
-	  None.
+	  In certain configurations, <command>named</command> could crash
+	  with an assertion failure if <command>nxdomain-redirect</command>
+	  was in use and a redirected query resulted in an NXDOMAIN from the
+	  cache. This flaw is disclosed in CVE-2019-6467. [GL #880]
 	</para>
       </listitem>
     </itemizedlist>