From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] zlib: Incorporate fix for CVE-2022-37434
Date: Sun, 07 Aug 2022 09:18:45 +0000
Message-ID: <b5a5c37b-4856-48eb-77d6-59c9409ec876@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3827660628994611086=="
List-Id: <development.lists.ipfire.org>

--===============3827660628994611086==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

https://www.cve.org/CVERecord?id=3DCVE-2022-37434

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 lfs/zlib                              |  4 ++++
 src/patches/zlib-CVE-2022-37434.patch | 29 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 src/patches/zlib-CVE-2022-37434.patch

diff --git a/lfs/zlib b/lfs/zlib
index 19740fb7f..8197c9b45 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -77,6 +77,10 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	# Fix for CVE-2022-37434
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zlib-CVE-2022-37434.pa=
tch
+
 	cd $(DIR_APP) && CROSS_PREFIX=3D$(CROSS_PREFIX) ./configure --prefix=3D$(PR=
EFIX) --shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/src/patches/zlib-CVE-2022-37434.patch b/src/patches/zlib-CVE-202=
2-37434.patch
new file mode 100644
index 000000000..95e9f173f
--- /dev/null
+++ b/src/patches/zlib-CVE-2022-37434.patch
@@ -0,0 +1,29 @@
+commit eff308af425b67093bab25f80f1ae950166bece1
+Author: Mark Adler <fork(a)madler.net>
+Date:   Sat Jul 30 15:51:11 2022 -0700
+
+    Fix a bug when getting a gzip header extra field with inflate().
+   =20
+    If the extra field was larger than the space the user provided with
+    inflateGetHeader(), and if multiple calls of inflate() delivered
+    the extra header data, then there could be a buffer overflow of the
+    provided space. This commit assures that provided space is not
+    exceeded.
+
+diff --git a/inflate.c b/inflate.c
+index 7be8c63..7a72897 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -763,9 +763,10 @@ int flush;
+                 copy =3D state->length;
+                 if (copy > have) copy =3D have;
+                 if (copy) {
++                    len =3D state->head->extra_len - state->length;
+                     if (state->head !=3D Z_NULL &&
+-                        state->head->extra !=3D Z_NULL) {
+-                        len =3D state->head->extra_len - state->length;
++                        state->head->extra !=3D Z_NULL &&
++                        len < state->head->extra_max) {
+                         zmemcpy(state->head->extra + len, next,
+                                 len + copy > state->head->extra_max ?
+                                 state->head->extra_max - len : copy);
--=20
2.35.3

--===============3827660628994611086==--