[openwrt/openwrt] zlib: backport null dereference fix

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/707ec48ab3db6d08bd022df1bc720aee68b3b99d

commit 707ec48ab3db6d08bd022df1bc720aee68b3b99d
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Tue Aug 9 07:50:19 2022 +0200

    zlib: backport null dereference fix
    
    The curl developers found test case that crashed in their testing when
    using zlib patched against CVE-2022-37434, same patch we've backported
    in commit 7df6795d4c25 ("zlib: backport fix for heap-based buffer
    over-read (CVE-2022-37434)"). So we need to backport following patch in
    order to fix issue introduced in that previous CVE-2022-37434 fix.
    
    References: https://github.com/curl/curl/issues/9271
    Fixes: 7df6795d4c25 ("zlib: backport fix for heap-based buffer over-read (CVE-2022-37434)")
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    (cherry picked from commit f443e9de7003c00a935b9ea12f168e09e83b48cd)
---
 package/libs/zlib/Makefile                         |  2 +-
 ...ix-null-dereference-in-fix-CVE-2022-37434.patch | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index 4f3c7a6b37..f30accf163 100644
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.11
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/libpng http://www.zlib.net
diff --git a/package/libs/zlib/patches/007-fix-null-dereference-in-fix-CVE-2022-37434.patch b/package/libs/zlib/patches/007-fix-null-dereference-in-fix-CVE-2022-37434.patch
new file mode 100644
index 0000000000..c5c95a92b2
--- /dev/null
+++ b/package/libs/zlib/patches/007-fix-null-dereference-in-fix-CVE-2022-37434.patch
@@ -0,0 +1,29 @@
+From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
+From: Mark Adler <fork at madler.net>
+Date: Mon, 8 Aug 2022 10:50:09 -0700
+Subject: [PATCH] Fix extra field processing bug that dereferences NULL
+ state->head.
+
+The recent commit to fix a gzip header extra field processing bug
+introduced the new bug fixed here.
+---
+ inflate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/inflate.c b/inflate.c
+index 7a7289749..2a3c4fe98 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -763,10 +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_max) {
++                        (len = state->head->extra_len - state->length) <
++                            state->head->extra_max) {
+                         zmemcpy(state->head->extra + len, next,
+                                 len + copy > state->head->extra_max ?
+                                 state->head->extra_max - len : copy);