Prevent exahustion of memory from control channel (CVE-2023-3341)

SOURCES/bind-9.16-CVE-2023-3341.patch

@@ -0,0 +1,152 @@
+diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
+index b548a7a7bf..5a716bdcf2 100644
+--- a/lib/isccc/cc.c
++++ b/lib/isccc/cc.c
+@@ -54,6 +54,10 @@
+ 
+ #define MAX_TAGS     256
+ #define DUP_LIFETIME 900
++#ifndef ISCCC_MAXDEPTH
++#define ISCCC_MAXDEPTH \
++	10 /* Big enough for rndc which just sends a string each way. */
++#endif
+ 
+ typedef isccc_sexpr_t *sexpr_ptr;
+ 
+@@ -486,19 +490,25 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length,
+ 
+ static isc_result_t
+ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+-	       uint32_t algorithm, isccc_sexpr_t **alistp);
++	       uint32_t algorithm, unsigned int depth, isccc_sexpr_t **alistp);
+ 
+ static isc_result_t
+-list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp);
++list_fromwire(isccc_region_t *source, unsigned int depth,
++	      isccc_sexpr_t **listp);
+ 
+ static isc_result_t
+-value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) {
++value_fromwire(isccc_region_t *source, unsigned int depth,
++	       isccc_sexpr_t **valuep) {
+ 	unsigned int msgtype;
+ 	uint32_t len;
+ 	isccc_sexpr_t *value;
+ 	isccc_region_t active;
+ 	isc_result_t result;
+ 
++	if (depth > ISCCC_MAXDEPTH) {
++		return (ISCCC_R_MAXDEPTH);
++	}
++
+ 	if (REGION_SIZE(*source) < 1 + 4) {
+ 		return (ISC_R_UNEXPECTEDEND);
+ 	}
+@@ -519,9 +529,9 @@ value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) {
+ 			result = ISC_R_NOMEMORY;
+ 		}
+ 	} else if (msgtype == ISCCC_CCMSGTYPE_TABLE) {
+-		result = table_fromwire(&active, NULL, 0, valuep);
++		result = table_fromwire(&active, NULL, 0, depth + 1, valuep);
+ 	} else if (msgtype == ISCCC_CCMSGTYPE_LIST) {
+-		result = list_fromwire(&active, valuep);
++		result = list_fromwire(&active, depth + 1, valuep);
+ 	} else {
+ 		result = ISCCC_R_SYNTAX;
+ 	}
+@@ -531,7 +541,7 @@ value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) {
+ 
+ static isc_result_t
+ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+-	       uint32_t algorithm, isccc_sexpr_t **alistp) {
++	       uint32_t algorithm, unsigned int depth, isccc_sexpr_t **alistp) {
+ 	char key[256];
+ 	uint32_t len;
+ 	isc_result_t result;
+@@ -541,6 +551,10 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+ 
+ 	REQUIRE(alistp != NULL && *alistp == NULL);
+ 
++	if (depth > ISCCC_MAXDEPTH) {
++		return (ISCCC_R_MAXDEPTH);
++	}
++
+ 	checksum_rstart = NULL;
+ 	first_tag = true;
+ 	alist = isccc_alist_create();
+@@ -557,7 +571,7 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+ 		GET_MEM(key, len, source->rstart);
+ 		key[len] = '\0'; /* Ensure NUL termination. */
+ 		value = NULL;
+-		result = value_fromwire(source, &value);
++		result = value_fromwire(source, depth + 1, &value);
+ 		if (result != ISC_R_SUCCESS) {
+ 			goto bad;
+ 		}
+@@ -595,14 +609,19 @@ bad:
+ }
+ 
+ static isc_result_t
+-list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp) {
++list_fromwire(isccc_region_t *source, unsigned int depth,
++	      isccc_sexpr_t **listp) {
+ 	isccc_sexpr_t *list, *value;
+ 	isc_result_t result;
+ 
++	if (depth > ISCCC_MAXDEPTH) {
++		return (ISCCC_R_MAXDEPTH);
++	}
++
+ 	list = NULL;
+ 	while (!REGION_EMPTY(*source)) {
+ 		value = NULL;
+-		result = value_fromwire(source, &value);
++		result = value_fromwire(source, depth + 1, &value);
+ 		if (result != ISC_R_SUCCESS) {
+ 			isccc_sexpr_free(&list);
+ 			return (result);
+@@ -634,7 +653,7 @@ isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp,
+ 		return (ISCCC_R_UNKNOWNVERSION);
+ 	}
+ 
+-	return (table_fromwire(source, secret, algorithm, alistp));
++	return (table_fromwire(source, secret, algorithm, 0, alistp));
+ }
+ 
+ static isc_result_t
+diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
+index 0f0b0f6534..56f9c386e0 100644
+--- a/lib/isccc/include/isccc/result.h
++++ b/lib/isccc/include/isccc/result.h
+@@ -35,8 +35,10 @@
+ #define ISCCC_R_CLOCKSKEW (ISC_RESULTCLASS_ISCCC + 4)
+ /*% Duplicate */
+ #define ISCCC_R_DUPLICATE (ISC_RESULTCLASS_ISCCC + 5)
++/*% Maximum recursion depth */
++#define ISCCC_R_MAXDEPTH (ISC_RESULTCLASS_ISCCC + 6)
+ 
+-#define ISCCC_R_NRESULTS 6 /*%< Number of results */
++#define ISCCC_R_NRESULTS 7 /*%< Number of results */
+ 
+ ISC_LANG_BEGINDECLS
+ 
+diff --git a/lib/isccc/result.c b/lib/isccc/result.c
+index 1498c2a859..127dd77e3b 100644
+--- a/lib/isccc/result.c
++++ b/lib/isccc/result.c
+@@ -25,12 +25,14 @@ static const char *text[ISCCC_R_NRESULTS] = {
+ 	"bad auth",	   /* 3 */
+ 	"expired",	   /* 4 */
+ 	"clock skew",	   /* 5 */
+-	"duplicate"	   /* 6 */
++	"duplicate",	   /* 6 */
++	"max depth"	   /* 7 */
+ };
+ 
+ static const char *ids[ISCCC_R_NRESULTS] = {
+ 	"ISCCC_R_UNKNOWNVERSION", "ISCCC_R_SYNTAX",    "ISCCC_R_BADAUTH",
+ 	"ISCCC_R_EXPIRED",	  "ISCCC_R_CLOCKSKEW", "ISCCC_R_DUPLICATE",
++	"ISCCC_R_MAXDEPTH"
+ };
+ 
+ #define ISCCC_RESULT_RESULTSET 2

SPECS/bind9.16.spec

@@ -57,7 +57,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind9.16
 License:  MPLv2.0
 Version:  9.16.23
-Release:  0.14%{?dist}.1.alma
+Release:  0.14%{?dist}.2.alma.1
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -129,6 +129,7 @@ Patch187: bind-9.16-CVE-2022-3924.patch
 # Patch is taken from bind upstream gitlab and updated to apply correctly:
 # https://gitlab.isc.org/isc-projects/bind9/commit/f1d9e9ee3859976f403914d20ad2a10855343702
 Patch188: bind-9.16-CVE-2023-2828.patch
+Patch189: bind-9.16-CVE-2023-3341.patch
 
 %{?systemd_ordering}
 Requires:       coreutils
@@ -441,6 +442,7 @@ in HTML and PDF format.
 %patch186 -p1 -b .CVE-2022-3736
 %patch187 -p1 -b .CVE-2022-3924
 %patch188 -p1 -b .CVE-2023-2828
+%patch189 -p1 -b .CVE-2023-3341
 
 %if %{with PKCS11}
 %patch135 -p1 -b .config-pkcs11
@@ -1160,6 +1162,9 @@ fi;
 %endif
 
 %changelog
+* Thu Oct 05 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 32:9.16.23-0.14.2.alma
+- Prevent exahustion of memory from control channel (CVE-2023-3341)
+
 * Mon Jul 17 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 32:9.16.23-0.14.1.alma
 - Improve RBT overmem cache cleaning (CVE-2023-2828)