summaryrefslogtreecommitdiffstats
path: root/debian/patches/0024-Update-policy-subdomain-was-incorrectly-treated-as-z.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0024-Update-policy-subdomain-was-incorrectly-treated-as-z.patch')
-rw-r--r--debian/patches/0024-Update-policy-subdomain-was-incorrectly-treated-as-z.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/0024-Update-policy-subdomain-was-incorrectly-treated-as-z.patch b/debian/patches/0024-Update-policy-subdomain-was-incorrectly-treated-as-z.patch
new file mode 100644
index 0000000..b2e6ac9
--- /dev/null
+++ b/debian/patches/0024-Update-policy-subdomain-was-incorrectly-treated-as-z.patch
@@ -0,0 +1,27 @@
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 29 Jul 2020 23:36:03 +1000
+Subject: [1/3] Update-policy 'subdomain' was incorrectly treated as 'zonesub'
+
+Origin: https://gitlab.isc.org/isc-projects/bind9/commit/e4cccf9668c7adee4724a7649ec64685f82c8677
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2020-8624
+
+resulting in names outside the specified subdomain having the wrong
+restrictions for the given key.
+---
+ bin/named/zoneconf.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
+index e237bdb..4898447 100644
+--- a/bin/named/zoneconf.c
++++ b/bin/named/zoneconf.c
+@@ -237,7 +237,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
+
+ str = cfg_obj_asstring(matchtype);
+ CHECK(dns_ssu_mtypefromstring(str, &mtype));
+- if (mtype == dns_ssumatchtype_subdomain) {
++ if (mtype == dns_ssumatchtype_subdomain &&
++ strcasecmp(str, "zonesub") == 0) {
+ usezone = true;
+ }
+