diff mbox series

[scarthgap] bind: Security fix for CVE-2026-19666

Message ID 20261116175500.328321-1-rsangam@mvista.com
State New
Headers show
Series [scarthgap] bind: Security fix for CVE-2026-19666 | expand

Commit Message

Rohini Sangam Nov. 16, 2026, 5:55 p.m. UTC
Pick patch from [1] also mentioned at Debian tracker in [2]

[1] https://github.com/isc-projects/bind9/commit/78175f9749fecdac4eb0d4b08dd064968b4c55f8
[2] https://security-tracker.debian.org/tracker/CVE-2026-19666

Signed-off-by: Rohini Sangam <rsangam@mvista.com>
---
 .../bind/bind/CVE-2026-19666.patch            | 113 ++++++++++++++++++
 .../recipes-connectivity/bind/bind_9.18.49.bb |   1 +
 2 files changed, 114 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2026-19666.patch
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/bind/bind/CVE-2026-19666.patch b/meta/recipes-connectivity/bind/bind/CVE-2026-19666.patch
new file mode 100644
index 0000000000..46f4030af3
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/CVE-2026-19666.patch
@@ -0,0 +1,113 @@ 
+From f1d4bc8b82d1f4635db38fc281c3eed7b589db65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 6 Aug 2026 15:09:34 +0200
+Subject: [PATCH] Clear the noqname alias on the DNS64 filter64 path
+
+When a partially excluded AAAA RRset is filtered rather than
+synthesized, query_addanswer() returns the original rdataset to the
+message rdataset pool, but qctx->noqname was aliased to it moments
+earlier in query_respond().  query_addnoqnameproof() then dereferences
+the freed object, and named aborts on the methods != NULL assertion
+because the pool has already handed the memory back out.
+
+The sibling DNS64 synthesis arm clears the alias for exactly this
+reason; the filter64 arm has needed the same treatment ever since DNS64
+was added, and was missed when the synthesis arm was fixed.  Dropping
+the proof is also what the answer deserves: filtering the RRset has
+already discarded its signature.
+
+(cherry picked from commit 9ddfd2e4da7374ab2f6eaa67cd48d99116a8f60e)
+
+CVE: CVE-2026-19666
+Upstream-Status: Backport from https://github.com/isc-projects/bind9/commit/78175f9749fecdac4eb0d4b08dd064968b4c55f8
+
+Signed-off-by: Rohini Sangam <rsangam@mvista.com>
+---
+ bin/tests/system/dns64/ns1/example.db    |  3 +++
+ bin/tests/system/dns64/ns2/named.conf.in |  8 ++++++++
+ bin/tests/system/dns64/tests.sh          | 23 +++++++++++++++++++++++
+ lib/ns/query.c                           |  1 +
+ 4 files changed, 35 insertions(+)
+
+diff --git a/bin/tests/system/dns64/ns1/example.db b/bin/tests/system/dns64/ns1/example.db
+index 8253f1d..92a00ed 100644
+--- a/bin/tests/system/dns64/ns1/example.db
++++ b/bin/tests/system/dns64/ns1/example.db
+@@ -26,6 +26,9 @@ partially-excluded-bad-a	AAAA	2001:eeee::2
+ 		A	10.0.0.1
+ partially-excluded-only	AAAA	2001:eeee::3
+ 		AAAA	2001::3
++; A wildcard match yields a signed answer carrying a NOQNAME proof.
++*.wild-partially-excluded AAAA	2001:eeee::4
++		AAAA	2001::4
+ a-only		A	1.2.3.5
+ a-and-aaaa	AAAA	2001::1
+ 		A	1.2.3.6
+diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
+index 263cc8a..64e032b 100644
+--- a/bin/tests/system/dns64/ns2/named.conf.in
++++ b/bin/tests/system/dns64/ns2/named.conf.in
+@@ -47,6 +47,14 @@ options {
+ 		suffix ::;
+ 	};
+ 
++	dns64 2001:cccc::/96 {
++		clients { 10.53.0.8; };
++		mapped { !rfc1918; any; };
++		exclude { 2001:eeee::/32; 64:FF9B::/96; ::ffff:0000:0000/96; };
++		suffix ::;
++		break-dnssec yes;
++	};
++
+ 	dns64-server "dns64.example.net.";
+ 	dns64-contact "hostmaster.example.net.";
+ 	dns64 2001:32::/32 { clients { 10.53.0.6; }; };
+diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
+index 231e825..2a41f98 100644
+--- a/bin/tests/system/dns64/tests.sh
++++ b/bin/tests/system/dns64/tests.sh
+@@ -1276,6 +1276,29 @@ n=$((n + 1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=$((status + ret))
+ 
++# The answer is wildcard-expanded, so it is cached with a NOQNAME proof,
++# and it is partially excluded, so it is filtered rather than synthesized.
++# 10.53.0.8 is the only client for which break-dnssec is in effect, which
++# is what lets a +dnssec query reach the filtering path at all.
++echo_i "checking partially-excluded wildcard AAAA lookup in signed zone works with +dnssec ($n)"
++ret=0
++$DIG $DIGOPTS +dnssec a.wild-partially-excluded.signed. @10.53.0.2 -b 10.53.0.8 aaaa >dig.out.ns2.test$n || ret=1
++grep "status: NOERROR" dig.out.ns2.test$n >/dev/null || ret=1
++grep "ANSWER: 1," dig.out.ns2.test$n >/dev/null || ret=1
++grep "2001::4" dig.out.ns2.test$n >/dev/null || ret=1
++grep "2001:eeee::4" dig.out.ns2.test$n >/dev/null && ret=1
++n=$((n + 1))
++if [ $ret != 0 ]; then echo_i "failed"; fi
++status=$((status + ret))
++
++echo_i "checking ns2 survived the partially-excluded wildcard lookup ($n)"
++ret=0
++$DIG $DIGOPTS aaaa-only.signed. @10.53.0.2 -b 10.53.0.2 aaaa >dig.out.ns2.test$n || ret=1
++grep "status: NOERROR" dig.out.ns2.test$n >/dev/null || ret=1
++n=$((n + 1))
++if [ $ret != 0 ]; then echo_i "failed"; fi
++status=$((status + ret))
++
+ echo_i "checking reverse mapping ($n)"
+ ret=0
+ $DIG $DIGOPTS -x 2001:aaaa::10.0.0.1 @10.53.0.2 >dig.out.ns2.test$n || ret=1
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 86485b7..6b38606 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -8329,6 +8329,7 @@ query_addanswer(query_ctx_t *qctx) {
+ 		}
+ 	} else if (qctx->client->query.dns64_aaaaok != NULL) {
+ 		query_filter64(qctx);
++		qctx->noqname = NULL;
+ 		ns_client_putrdataset(qctx->client, &qctx->rdataset);
+ 		isc_mem_put(qctx->client->mctx,
+ 			    qctx->client->query.dns64_aaaaok,
+-- 
+2.44.4
+
diff --git a/meta/recipes-connectivity/bind/bind_9.18.49.bb b/meta/recipes-connectivity/bind/bind_9.18.49.bb
index fef00e363f..6396f4ffc1 100644
--- a/meta/recipes-connectivity/bind/bind_9.18.49.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.49.bb
@@ -20,6 +20,7 @@  SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://0001-avoid-start-failure-with-bind-user.patch \
            file://CVE-2026-19667-1.patch \
            file://CVE-2026-19667-2.patch \
+           file://CVE-2026-19666.patch \
            "
 
 SRC_URI[sha256sum] = "c43ce4548ebed788cd9df63658a7de105ceafba43fcd63fa352b1093e525cd24"