diff --git a/.zlib.checksum b/.zlib.checksum new file mode 100644 index 0000000000000000000000000000000000000000..af576720185ba144a8f78b611001a94bb9dc1cc5 --- /dev/null +++ b/.zlib.checksum @@ -0,0 +1 @@ +15f3026993c28b0fdf5b7b1db254b7a364d58d4259bdf90ec50d5e0345ee2383 diff --git a/.zlib.metadata b/.zlib.metadata index e6edbe95657cc533b83e36474c622efc08109393..f4f2428eb9c3b5dfa93760f31657b82ff4f43b1c 100644 --- a/.zlib.metadata +++ b/.zlib.metadata @@ -1 +1 @@ -e1cb0d5c92da8e9a8c2635dfa249c341dfd00322 SOURCES/zlib-1.2.11.tar.xz +4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 SOURCES/zlib-1.2.11.tar.xz diff --git a/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix-crash-deflateBound.patch b/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix-crash-deflateBound.patch new file mode 100644 index 0000000000000000000000000000000000000000..089395c907f9d885f90f9e6e093f816586ca3135 --- /dev/null +++ b/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix-crash-deflateBound.patch @@ -0,0 +1,17 @@ +--- zlib-1.2.11/contrib/s390/dfltcc_deflate.h.old 2023-05-04 09:39:23.423753908 +0000 ++++ zlib-1.2.11/contrib/s390/dfltcc_deflate.h 2023-05-04 09:39:48.087753908 +0000 +@@ -45,11 +45,11 @@ int ZLIB_INTERNAL dfltcc_deflate_get_dic + #define DEFLATE_DONE dfltcc_deflate_done + #define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, source_len) \ + do { \ +- if (dfltcc_can_deflate((strm))) \ ++ if (deflateStateCheck((strm)) || dfltcc_can_deflate((strm))) \ + (complen) = DEFLATE_BOUND_COMPLEN(source_len); \ + } while (0) + #define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) (dfltcc_can_deflate((strm))) + #define DEFLATE_HOOK dfltcc_deflate + #define DEFLATE_NEED_CHECKSUM(strm) (!dfltcc_can_deflate((strm))) + +-#endif +\ No newline at end of file ++#endif diff --git a/SPECS/zlib.spec b/SPECS/zlib.spec index 93166f9f1474604fd13072d846b098876e14d6a4..dba4101a036fb61b5f66b5b7854968d827be493b 100644 --- a/SPECS/zlib.spec +++ b/SPECS/zlib.spec @@ -2,7 +2,7 @@ Name: zlib Version: 1.2.11 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Compression and decompression library # /contrib/dotzlib/ have Boost license License: zlib and Boost @@ -60,6 +60,10 @@ Patch27: zlib-1.2.11-Fix-broken-libxml2-for-python311.patch # fixed covscan issues Patch28: zlib-1.2.11-covscan-issues.patch +# Fix for Crash in zlib deflateBound() function on s390x +# Resolves: #2193044 +Patch29: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix-crash-deflateBound.patch + BuildRequires: make BuildRequires: automake, autoconf, libtool @@ -136,6 +140,7 @@ developing applications which use minizip. %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp @@ -213,6 +218,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Thu May 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-40 +- Fix the Crash in zlib deflateBound() function on s390x +- Resolves: BZ#2193044 + * Thu Feb 09 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-39 - Fix covscan issue CWE-681