zlib: fix CVE-2022-37434

Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 38 insertions, 0 deletions

diff --git a/recipes-core/zlib/files/CVE-2022-37434.patch b/recipes-core/zlib/files/CVE-2022-37434.patch
new file mode 100644
index 00000000..052cdf60
--- /dev/null
+++ b/recipes-core/zlib/files/CVE-2022-37434.patch
@@ -0,0 +1,37 @@
+From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
+From: Mark Adler <fork@madler.net>
+Date: Sat, 30 Jul 2022 15:51:11 -0700
+Subject: [PATCH] Fix a bug when getting a gzip header extra field with
+ inflate().
+
+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.
+
+Upstream-Status: Backport
+[ https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1 ]
+CVE: CVE-2022-37434
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ inflate.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/inflate.c b/inflate.c
+index 7be8c6366..7a7289749 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -763,9 +763,10 @@ int flush;
+                 copy = state->length;
+                 if (copy > have) copy = have;
+                 if (copy) {
++                    len = state->head->extra_len - state->length;
+                     if (state->head != Z_NULL &&
+-                        state->head->extra != Z_NULL) {
+-                        len = state->head->extra_len - state->length;
++                        state->head->extra != 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);
diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
index 27bfd9b1..038171dc 100644
--- a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
+++ b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/jtkukunas/zlib.git;protocol=https;branch=master \
            file://run-ptest \
            file://CVE-2018-25032-fuzz-fixed.patch \
            file://fix-removed-last-lit.patch \
+           file://CVE-2022-37434.patch \
            "
 
 SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010"