From bbc6006504ee031b95fca492b31d528d49b75b99 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2021 13:57:37 +0000
Subject: import bind-9.11.4-26.P2.el7_9.4


---

diff --git a/SOURCES/bind-9.11-CVE-2020-8625.patch b/SOURCES/bind-9.11-CVE-2020-8625.patch
new file mode 100644
index 0000000..75c1506
--- /dev/null
+++ b/SOURCES/bind-9.11-CVE-2020-8625.patch
@@ -0,0 +1,27 @@
+From 9f331a945071365ccc0cfba24241c4af6919af30 Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Mon, 15 Feb 2021 12:18:14 +0100
+Subject: [PATCH] CVE-2020-8625
+
+5562.	[security]	Fix off-by-one bug in ISC SPNEGO implementation.
+			(CVE-2020-8625) [GL #2354]
+---
+ lib/dns/spnego.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
+index dea108b..13cf15d 100644
+--- a/lib/dns/spnego.c
++++ b/lib/dns/spnego.c
+@@ -877,7 +877,7 @@ der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size) {
+ 		return (ASN1_OVERRUN);
+ 	}
+ 
+-	data->components = malloc(len * sizeof(*data->components));
++	data->components = malloc((len + 1) * sizeof(*data->components));
+ 	if (data->components == NULL) {
+ 		return (ENOMEM);
+ 	}
+-- 
+2.26.2
+
diff --git a/SPECS/bind.spec b/SPECS/bind.spec
index d1a4813..602b5bd 100644
--- a/SPECS/bind.spec
+++ b/SPECS/bind.spec
@@ -64,7 +64,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.11.4
-Release:  26%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}.3
+Release:  26%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}.4
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 #
@@ -177,6 +177,7 @@ Patch190: bind-9.11-CVE-2020-8623.patch
 Patch191: bind-9.11-CVE-2020-8624.patch
 Patch192: bind98-rh1769876.patch
 Patch193: bind-9.11-rh1889902.patch
+Patch194: bind-9.11-CVE-2020-8625.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -547,6 +548,7 @@ are used for building ISC DHCP.
 %patch191 -p1 -b .CVE-2020-8624
 %patch192 -p1 -b .rh1769876
 %patch193 -p1 -b .rh1889902
+%patch194 -p1 -b .CVE-2020-8625
 
 # Override upstream builtin keys
 cp -fp %{SOURCE29} bind.keys
@@ -1528,6 +1530,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Mon Feb 15 2021 Petr Menšík <pemensik@redhat.com> - 32:9.11.4-26.P2.4
+- Fix off-by-one bug in ISC SPNEGO implementation (CVE-2020-8625)
+
 * Fri Nov 06 2020 Tomas Korbar <tkorbar@redhat.com> - 32:9.11.4-26.P2.3
 - Fix inline re-signing (#rh1889902)