From 07e1d59e546df1f4b6d3042b204f0723d165bc50 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Tue, 15 Nov 2022 08:49:04 +0000
Subject: [PATCH] import zlib-1.2.11-34.el9
---
...accelrated-deflate-compressBound-fix.patch | 90 +++++++++++++++++++
SPECS/zlib.spec | 12 ++-
2 files changed, 99 insertions(+), 3 deletions(-)
create mode 100644 SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch
diff --git a/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch b/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch
new file mode 100644
index 0000000..3db5676
--- /dev/null
+++ b/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch
@@ -0,0 +1,90 @@
+--- a/compress.c
++++ b/compress.c
+@@ -5,9 +5,15 @@
+
+ /* @(#) $Id$ */
+
+-#define ZLIB_INTERNAL
++#include "zutil.h"
+ #include "zlib.h"
+
++#ifdef DFLTCC
++# include "contrib/s390/dfltcc.h"
++#else
++#define DEFLATE_BOUND_COMPLEN(source_len) 0
++#endif
++
+ /* ===========================================================================
+ Compresses the source buffer into the destination buffer. The level
+ parameter has the same meaning as in deflateInit. sourceLen is the byte
+@@ -81,6 +87,12 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
+ uLong ZEXPORT compressBound (sourceLen)
+ uLong sourceLen;
+ {
++ uLong complen = DEFLATE_BOUND_COMPLEN(sourceLen);
++
++ if (complen > 0)
++ /* Architecture-specific code provided an upper bound. */
++ return complen + ZLIB_WRAPLEN;
++
+ return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+ (sourceLen >> 25) + 13;
+ }
+--- a/contrib/s390/dfltcc.h
++++ b/contrib/s390/dfltcc.h
+@@ -12,6 +12,28 @@ void ZLIB_INTERNAL dfltcc_reset OF((z_streamp strm, uInt size));
+ voidpf ZLIB_INTERNAL dfltcc_alloc_window OF((z_streamp strm, uInt items,
+ uInt size));
+ void ZLIB_INTERNAL dfltcc_free_window OF((z_streamp strm, voidpf w));
++#define DFLTCC_BLOCK_HEADER_BITS 3
++#define DFLTCC_HLITS_COUNT_BITS 5
++#define DFLTCC_HDISTS_COUNT_BITS 5
++#define DFLTCC_HCLENS_COUNT_BITS 4
++#define DFLTCC_MAX_HCLENS 19
++#define DFLTCC_HCLEN_BITS 3
++#define DFLTCC_MAX_HLITS 286
++#define DFLTCC_MAX_HDISTS 30
++#define DFLTCC_MAX_HLIT_HDIST_BITS 7
++#define DFLTCC_MAX_SYMBOL_BITS 16
++#define DFLTCC_MAX_EOBS_BITS 15
++#define DFLTCC_MAX_PADDING_BITS 7
++#define DEFLATE_BOUND_COMPLEN(source_len) \
++ ((DFLTCC_BLOCK_HEADER_BITS + \
++ DFLTCC_HLITS_COUNT_BITS + \
++ DFLTCC_HDISTS_COUNT_BITS + \
++ DFLTCC_HCLENS_COUNT_BITS + \
++ DFLTCC_MAX_HCLENS * DFLTCC_HCLEN_BITS + \
++ (DFLTCC_MAX_HLITS + DFLTCC_MAX_HDISTS) * DFLTCC_MAX_HLIT_HDIST_BITS + \
++ (source_len) * DFLTCC_MAX_SYMBOL_BITS + \
++ DFLTCC_MAX_EOBS_BITS + \
++ DFLTCC_MAX_PADDING_BITS) >> 3)
+ int ZLIB_INTERNAL dfltcc_can_inflate OF((z_streamp strm));
+ typedef enum {
+ DFLTCC_INFLATE_CONTINUE,
+diff --git a/contrib/s390/dfltcc_deflate.h b/contrib/s390/dfltcc_deflate.h
+index 03f7f53..46acfc5 100644
+--- a/contrib/s390/dfltcc_deflate.h
++++ b/contrib/s390/dfltcc_deflate.h
+@@ -46,8 +46,7 @@ int ZLIB_INTERNAL dfltcc_deflate_get_dictionary OF((z_streamp strm,
+ #define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, source_len) \
+ do { \
+ if (dfltcc_can_deflate((strm))) \
+- (complen) = (3 + 5 + 5 + 4 + 19 * 3 + (286 + 30) * 7 + \
+- (source_len) * 16 + 15 + 7) >> 3; \
++ (complen) = DEFLATE_BOUND_COMPLEN(source_len); \
+ } while (0)
+ #define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) (dfltcc_can_deflate((strm)))
+ #define DEFLATE_HOOK dfltcc_deflate
+diff --git a/zutil.h b/zutil.h
+index 14277bc..cf90e49 100644
+--- a/zutil.h
++++ b/zutil.h
+@@ -87,6 +87,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+
+ #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
++#define ZLIB_WRAPLEN 6 /* zlib format overhead */
++
+ /* target dependencies */
+
+ #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
diff --git a/SPECS/zlib.spec b/SPECS/zlib.spec
index 4dc1591..b6c1d84 100644
--- a/SPECS/zlib.spec
+++ b/SPECS/zlib.spec
@@ -2,7 +2,7 @@
Name: zlib
Version: 1.2.11
-Release: 32%{?dist}
+Release: 34%{?dist}
Summary: Compression and decompression library
# /contrib/dotzlib/ have Boost license
License: zlib and Boost
@@ -35,6 +35,8 @@ Patch14: zlib-1.2.11-inflateSyncPoint-return-value-fix.patch
Patch15: zlib-1.2.11-covscan-issues-rhel9.patch
# Fix for s390x vectorize CRC32
Patch16: zlib-1.2.11-s390x-vectorize-crc32.patch
+# fix for IBM Z optimalizations
+Patch17: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch
Patch18: zlib-1.2.11-CVE-2018-25032.patch
# Fix for CVE-2022-37434
@@ -109,6 +111,7 @@ developing applications which use minizip.
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
@@ -189,14 +192,17 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog
-* Wed Aug 10 2022 Matej Mužila <mmuzila@redhat.com> - 1.2.11-32
+* Wed Aug 10 2022 Matej Mužila <mmuzila@redhat.com> - 1.2.11-34
- Fix heap-based buffer over-read or buffer overflow in inflate in inflate.c
- Resolves: CVE-2022-37434
-* Mon Apr 25 2022 Matej Mužila <mmuzila@redhat.com> - 1.2.11-31.1
+* Mon Apr 25 2022 Matej Mužila <mmuzila@redhat.com> - 1.2.11-33
- Fix CVE-2018-25032
Resolves: CVE-2018-25032
+* Tue Mar 01 2022 Ilya Leoshkevich <iii@linux.ibm.com> - 1.2.11-32
+- Fix for IBM compressBound() rhbz#2056899
+
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.11-31
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
--
GitLab