fixup! Fix RPZ name-too-long wildcard expansion (CVE-2026-11331)
CVE: CVE-2026-11331 Resolves: RHEL-213768
This commit is contained in:
parent
c88ee05b52
commit
7198a64100
69
bind-9.18-CVE-2026-11331-test.patch
Normal file
69
bind-9.18-CVE-2026-11331-test.patch
Normal file
@ -0,0 +1,69 @@
|
||||
From 8a54e87eee8ccb80f6b96c211c5d655b64feb28e Mon Sep 17 00:00:00 2001
|
||||
From: Mark Andrews <marka@isc.org>
|
||||
Date: Fri, 10 Apr 2026 10:24:06 +1000
|
||||
Subject: [PATCH] Fix TTL extraction from A/AAAA record
|
||||
|
||||
(cherry picked from commit 89c86e338db2492b92e6618c586f146c6928dc6d)
|
||||
(cherry picked from commit adc8285d23e2eac6ec463f5dbc5a9596fdd36c60)
|
||||
|
||||
Check rpz name too long wildcard CNAME expansion handling
|
||||
|
||||
(cherry picked from commit 9345394e2097031b55b3ef34ceaadf5a7ebbeef2)
|
||||
(cherry picked from commit 095b11f20f911f5b8059bdc349b256d6c64ece30)
|
||||
---
|
||||
bin/tests/system/rpz/ns2/tld2.db | 2 ++
|
||||
bin/tests/system/rpz/ns4/tld4.db | 2 ++
|
||||
bin/tests/system/rpz/tests.sh | 7 +++++--
|
||||
3 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
|
||||
index c6f2556db5..c091ee27b7 100644
|
||||
--- a/bin/tests/system/rpz/ns2/tld2.db
|
||||
+++ b/bin/tests/system/rpz/ns2/tld2.db
|
||||
@@ -123,3 +123,5 @@ a7-1 A 192.168.7.1
|
||||
|
||||
a7-2 A 192.168.7.2
|
||||
TXT "a7-2 tld2 text"
|
||||
+
|
||||
+*.wild A 192.168.9.1
|
||||
diff --git a/bin/tests/system/rpz/ns4/tld4.db b/bin/tests/system/rpz/ns4/tld4.db
|
||||
index fca419c6dd..8accd76baf 100644
|
||||
--- a/bin/tests/system/rpz/ns4/tld4.db
|
||||
+++ b/bin/tests/system/rpz/ns4/tld4.db
|
||||
@@ -59,6 +59,8 @@ a3-6.tld2 A 56.56.56.56
|
||||
|
||||
a3-7.sub1.tld2 A 57.57.57.57
|
||||
|
||||
+*.wild.sub1.tld2 A 57.57.57.57
|
||||
+
|
||||
a3-8.tld2 A 58.58.58.58
|
||||
|
||||
a3-9.sub9.tld2 A 59.59.59.59
|
||||
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
|
||||
index 2404c9f4ba..67b6710c16 100644
|
||||
--- a/bin/tests/system/rpz/tests.sh
|
||||
+++ b/bin/tests/system/rpz/tests.sh
|
||||
@@ -391,7 +391,7 @@ addr() {
|
||||
digcmd $2 >$DIGNM
|
||||
#ckalive "$2" "server crashed by 'dig $2'" || return 1
|
||||
ADDR_ESC=$(echo "$ADDR" | sed -e 's/\./\\./g')
|
||||
- ADDR_TTL=$(sed -n -e "s/^[-.a-z0-9]\{1,\}[ ]*\([0-9]*\) IN AA* ${ADDR_ESC}\$/\1/p" $DIGNM)
|
||||
+ ADDR_TTL=$(sed -n -e "s/^[-.a-z0-9]\{1,\}[ ]*\([0-9]*\)[ ]IN[ ]AA*[ ]${ADDR_ESC}\$/\1/p" $DIGNM)
|
||||
if test -z "$ADDR_TTL"; then
|
||||
setret "'dig $2' wrong; no address $ADDR record in $DIGNM"
|
||||
return 0
|
||||
@@ -516,7 +516,10 @@ nochange TCP a3-9.tld2 # 33 tcp-only
|
||||
here x.servfail <<'EOF' # 34 qname-wait-recurse yes
|
||||
;; status: SERVFAIL, x
|
||||
EOF
|
||||
-addr 35.35.35.35 "x.servfail @$ns5" # 35 qname-wait-recurse no
|
||||
+addr 35.35.35.35 "x.servfail @$ns5" # 35 qname-wait-recurse no
|
||||
+here aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.wild.sub1.tld2 <<'EOF' # 36 wildcard CNAME name to long
|
||||
+ ;; status: YXDOMAIN, x
|
||||
+EOF
|
||||
end_group
|
||||
ckstats $ns3 test1 ns3 22
|
||||
ckstats $ns5 test1 ns5 1
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@ -182,10 +182,13 @@ Patch239: bind-9.18-CVE-2026-11622.patch
|
||||
Patch240: bind-9.18-CVE-2026-13321.patch
|
||||
# https://github.com/isc-projects/bind9/commit/c9cb6a5e24e43489cf3fd4d4cc2193b6a74499cb
|
||||
Patch241: bind-9.18-CVE-2026-10723.patch
|
||||
# https://gitlab.isc.org/isc-projects/bind9/commit/adc8285d23e2eac6ec463f5dbc5a9596fdd36c60
|
||||
# https://gitlab.isc.org/isc-projects/bind9/commit/095b11f20f911f5b8059bdc349b256d6c64ece30
|
||||
Patch242: bind-9.18-CVE-2026-11331-test.patch
|
||||
# https://gitlab.isc.org/isc-projects/bind9/commit/19e496ca260b6a756ae1378e8ebcbdb666b7d9ed
|
||||
Patch242: bind-9.18-CVE-2026-11721-test.patch
|
||||
Patch243: bind-9.18-CVE-2026-11721-test.patch
|
||||
# https://gitlab.isc.org/isc-projects/bind9/commit/1a4986e2533f87e80eb21da3f06708d335aff1e2
|
||||
Patch243: bind-9.18-CVE-2026-11721-fix2.patch
|
||||
Patch244: bind-9.18-CVE-2026-11721-fix2.patch
|
||||
|
||||
%{?systemd_ordering}
|
||||
# https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers
|
||||
|
||||
Loading…
Reference in New Issue
Block a user