230545
From e2aae621408c7622d094f13a67b928f911a2793b Mon Sep 17 00:00:00 2001
230545
From: Petr Mensik <pemensik@redhat.com>
230545
Date: Tue, 18 Aug 2020 10:55:50 +0200
230545
Subject: [PATCH] Fix CVE-2020-8624
230545
230545
5481.	[security]	"update-policy" rules of type "subdomain" were
230545
			incorrectly treated as "zonesub" rules, which allowed
230545
			keys used in "subdomain" rules to update names outside
230545
			of the specified subdomains. The problem was fixed by
230545
			making sure "subdomain" rules are again processed as
230545
			described in the ARM. (CVE-2020-8624) [GL #2055]
230545
---
230545
 bin/named/zoneconf.c | 3 ++-
230545
 1 file changed, 2 insertions(+), 1 deletion(-)
230545
230545
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
230545
index 55f191b..b77a07c 100644
230545
--- a/bin/named/zoneconf.c
230545
+++ b/bin/named/zoneconf.c
230545
@@ -239,7 +239,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
230545
 
230545
 		str = cfg_obj_asstring(matchtype);
230545
 		CHECK(dns_ssu_mtypefromstring(str, &mtype));
230545
-		if (mtype == dns_ssumatchtype_subdomain) {
230545
+		if (mtype == dns_ssumatchtype_subdomain &&
230545
+		    strcasecmp(str, "zonesub") == 0) {
230545
 			usezone = true;
230545
 		}
230545
 
230545
-- 
230545
2.26.2
230545